Re: SVN Merge !!

On Feb 2, 2007, at 3:55 AM, Andy Levy wrote:

> 1) After A commits, B just runs svn update. If they had changes that
> conflict, Subversion flags these and leaves it to the user to resolve.
> If they don't have changes that conflict, the A's changes are merged
> into B's version.

And if B tries to commit without doing the update, because he doesn't
know about A's change, svn will stop the commit and tell him that the
file is not up to date. So he will be told that he needs to do it.

janine

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 2 20:04:26 2007