Re: Unable to resolve conflicts in merge results?

Robert Dailey wrote:
> Hi,
>
> Using the latest nightly build of TortoiseSVN, I am unable to resolve
> property conflicts during a merge.
>
> I have a feature branch that I occasionally synchronize with trunk. One
> of the changes merged over from trunk was a property change to a
> directory. In the progress dialog for the merge, I right click on the
> red item (Conflicted) and there is no option to open that conflict in
> TortoiseMerge and resolve the conflict. Even after pressing OK on the
> progress dialog and going to "TortoiseSVN >> Resolved...", I am unable
> to resolve that property conflict.
>
> Is this broken?

Broken? No. But not implemented :)
Resolving property conflicts is not possible with TortoiseMerge, because
properties are still considered 'binary' by the svn library and
therefore it doesn't create all the files to have a three-way merge
shown for the conflict. You have to resolve property conflicts manually
by checking the properties and the *reject file.

As for the interactive resolve conflict dialog during a merge, it *can*
help resolve property conflicts, but only if Subversion provides the
files for this (which is doesn't do in all situations).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net