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

Is there any way to turn off the automatic merging?

From: Michael Dixon <michael.dixon_at_denovosoftware.com>
Date: Tue, 21 Oct 2008 14:33:50 -0700

Hello,

We're supporting a release branch that was made over a year ago. Since
it's been around for so long, it has diverged pretty substantially from
the development trunk, and the automatic merger pretty much always gets
it wrong.

Is there any way to specify for a merge that I want to merge every file
myself? Essentially just mark every file involved in the merge as
conflicted without having Subversion try to merge the files itself.

Thanks,

-Mike

---------------------------------------------------------------------
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-21 23:34:00 CEST

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