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
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
