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

Masses and masses of tree-conflicts

From: John Dexter <jdxsolutions_at_googlemail.com>
Date: Mon, 28 Mar 2011 12:25:49 +0100

The situation is:

   1. I made changes in /trunk which were committed - fine
   2. I merged these changes into a branch and committed them to the branch
   - fine
   3. I merge the branch into trunk - suddenly loads of the files in
   question show as tree-conflicted

I'm seeing tens or hundreds of them, not folders but individual files. I
don't know if it's a Tortoise issue or SVN itself but it's really annoying
and also reduces my trust in SVN not to do something horrible to my
important files!

So any help understanding what it means, why it happens is welcome... and of
course advice on how to deal with it or stop it happening.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-28 13:26:29 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.