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

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