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

RE: Re: Unexpected successful merge in a conflict

From: Arunmozhi <arunmozhi_v_at_yahoo.com>
Date: Wed, 25 Jul 2012 12:19:48 -0700 (PDT)

This is the merged result.

Line 1
Line 2
This is a long line
end of file

The tools like diff3 and beyond compare text merge shows the conflict correctly.

Although there is no strict definition of conflict and theoretically any change done by 2 or more people in any file of the project can be called as a conflict. However tools limit the practical definition of conflict as some change done at the same location.

Here a++ is added by 2 people at the same location. It is a conflict, but tools usually report the same change as successful merge unless there is no other change in the surrounding. Tortoise SVN also does the same. But in this case, there is also a deletion surrounding the added line and hence it should be reported as a conflict or successful merge with only one a++ line.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-25 21:19:55 CEST

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

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