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

Fatal Merge: merge of files not handled by given branch!

From: Thomas Lehmann <t.lehmann_at_rtsgroup.net>
Date: Thu, 30 Oct 2008 06:06:05 -0700 (PDT)

Hi,

I'm currently merging a whole branch into the main branch.
I get merge conflicts for files not being touched by any revision
in my branch (stop on copy)!

I should be able to rely on the fact that the left side of the merge
window does offer files only really modified in the context of this
branch. Otherwise I have to check again and again whether there is
any modification by looking in the log history (stop on copy)....
Uncomfortable...

Can you help?

kindly
Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-30 14:07:00 CET

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