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

Re: Is there any way to turn off the automatic merging?

From: Milen A. Radev <milen_at_radev.net>
Date: Wed, 22 Oct 2008 00:38:55 +0300

2008/10/22 Michael Dixon <michael.dixon_at_denovosoftware.com>:
> 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.
>

http://tortoisesvn.tigris.org/faq.html#noautomerge

-- 
Milen A. Radev
---------------------------------------------------------------------
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:39:04 CEST

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