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

Unable to resolve conflicts in merge results?

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Thu, 18 Sep 2008 13:54:03 -0500

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?
Received on 2008-09-18 20:54:15 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.