Re: How to fix a merge conflict on a directory?

[Daniel Shahaf]

For starters, figure out what the difference is between the value the
merge wants to delete (the value on the LHS of the merge) and the value
in the working copy (which had no local mods prior to running 'merge',
right?).

I wonder if the issue is that special logic for svn:mergeinfo kicks in
only for propmods and not for propdels?  What's the svn client version?
(patch version too)

David Aldrich wrote on Mon, Apr 29, 2013 at 07:21:18 +0000:
> 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_Gc​c44_29Oct2011/Docume​nts:3862
> /branches/TRY_DRA_Gc​c44_29Sept2011/Docum​ents:3863-3983
> /branches/TRY_DRA_Py​thon_14July10/Docume​nts:2616-2748
> [snip]
> /trunk/Documents:486​3-4900=======
> 
> >>>>>>> (incoming property value)
> 
> How do I resolve this type of conflict please?
> 
> David