RE: Re: Unexpected successful merge in a conflict

This is the merged result.

Line 1
Line 2
This is a long line
a++
a++
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.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2993024

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