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

duplicate merge conflict

From: Daniel Walter <d2walter_at_hotmail.com>
Date: Wed, 13 Apr 2011 23:01:37 -0400

When I merge changes in SVN, the merges work well except for the conflicts. For some reason, the merges are frequently (but not always done twice). As an example:
<<<<<<< .working
<<<<<<< .working
const int SERIALIZE_FIELDS_DATA_LENGTH = 83;
=======
const int SERIALIZE_FIELDS_DATA_LENGTH = 91;
>>>>>>> .merge-right.r462
=======
const int SERIALIZE_FIELDS_DATA_LENGTH = 91;
>>>>>>> .merge-right.r461

It appears that I am merging the changes between versions 442 and 462 into the current working copy so I don't understand where 461 is coming from.

This is happening both with Tortoise SVN (using Merge two different trees) or from the command line with:

svn merge tree1 tree2 --non-interactive
Received on 2011-04-14 08:44:09 CEST

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.