Hi
As a result of merging from trunk to a branch using a 1.7 svn client. Several directories now have conflicts. For example, directory 'Documents' contains dir_conflicts.prej, which contains:
Trying to delete property 'svn:mergeinfo'
but the local property value is different.
<<<<<<< (local property value)
/branches/TRY_DRA_Gcc44_29Oct2011/Documents:3862
/branches/TRY_DRA_Gcc44_29Sept2011/Documents:3863-3983
/branches/TRY_DRA_Python_14July10/Documents:2616-2748
[snip]
/trunk/Documents:4863-4900=======
>>>>>>> (incoming property value)
How do I resolve this type of conflict please?
David
Received on 2013-04-29 09:22:13 CEST