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

tree conflicts resolution

From: getagrip <getagrip_at_web.de>
Date: Thu, 27 Aug 2009 14:09:42 +0200

Tree conflic resolution does not work the same way it did before
tortoise 1.6.5.

When I rename a file on a /branch and merge this changeset back to
/trunk I get a tree-conflict in case the file has changed on the trunk
after the branch has been created.
In pre-versions of tortoise 1.6.5 I could "edit conflicts" and click on
"remove the file" or "keep the local file" which does not work anymore.

All I get now is the following message:

"Tree conflicts can only be resolved to 'working state'
'path/to/filename' is not resolved."

So I'm stuck as I cannot resolve the conflict without using the command


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-27 14:09:58 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.