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

Tree conflicts when merging multiple revisions

From: emerson <echofloripa.yell_at_gmail.com>
Date: Wed, 18 Aug 2010 11:38:28 +0100

I'm trying to run a merge with different revisions. We use a two tier
codebase approach with trunk and a stable branch and selectively
cherry-pick what should be merged.

After merging a few revisions, I have a "Summary of conflicts: Tree
conflicts: 2" message. How can I find out which the revisions actually
had the tree conflict?

The tree conflict messages are also really vague, without telling
exactly what the conflict is, which file or folder is missing or
whichever reason caused the tree conflict. Is there any way to get the
reason of the tree conflict?

Received on 2010-08-18 12:39:59 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.