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

Svn Merge - how to configure

From: Menny <rorealm_at_yahoo.com>
Date: Mon, 6 Oct 2008 10:21:56 -0700 (PDT)

When I merge my Working copy with a branch I get many conflicts, in fact
there only several files with the real conflicts in the red color, that i
should fix myself, the others files actually doesn't have conflicts in red
colors, but they are still reported as conflicted files. So every time i'm
making a merge i should open, save, close, and finally make that file
-"conflict resolved" a huge amount of files, that makes no sense, just
useless work.

So the question, could i somehow force the svn merge to ignore files without
real conflicts(red color) and merge all of them by itself, so my work would
be only solving the real conflicts(red color)?

Thank you in advance.


View this message in context: http://www.nabble.com/Svn-Merge---how-to-configure-tp19842367p19842367.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
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-06 19:22:05 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.