[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Conflicts with Copy-Modify-Merge

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: 2007-01-29 03:36:16 CET

Eric wrote:

> Say user A and user B (well, OK, "Harry" and "Sally" ... might as well
> stick to the conventions in The Book) both want to work on the same
> source file at the same time.
> If Harry makes a change to a line of code and Sally makes an
> incompatible change to the same line of code, I can see how Subversion
> will flag that as a "conflict" and make Harry and Sally fix it.
> Beyond that, I have no idea how Subversion can detect conflicts in a way
> that will save Harry and Sally from the situation where conflicts just
> go silently into the repository with no hint to anyone that they exist.

Commit often, update often and you won't have many surprises. Even if
you aren't ready to accept someone else's updates you can always use svn
status or diff to see what has changed - the repository is never hidden
from you. The idea is to cooperate and take advantage of each other's
work instead of going separate directions. On the other hand, if you
want to go your own way to a point where you can demonstrate that your
code is the best, you can always copy to your own branch and make your
case later for why it should be merged back at the expense of
alternative changes.

   Les Mikesell
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 29 03:38:16 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.