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

automatically resolve (some) tree conflicts

From: Michael Hüttermann <michael_at_huettermann.net>
Date: Mon, 20 Aug 2012 12:14:06 +0200

Hello,

nailing down some tree conflicts show that there are no differences at all
comparing merged versions. One example is a file that has the same name,
path and content, but was removed/added meanwhile, and Subversion lost the
tracking that it is exactly the same file than before. Is there a tool or
command to automatically resolve such sort of tree conflicts?

Thank you.

Regards
Michael
Received on 2012-08-20 12:14:45 CEST

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

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