Re: Feature request: Option to disable autmatic merges when updating the w.c.

On Thu, Aug 23, 2012 at 10:42 AM, Markus Humm
<markus.humm_at_de.ebmpapst.com> wrote:
> For software projects, it might make sense to have the possibility to deactivate automatic merges when updating the working copy. In this case EVERY file that has been changed both in the working copy and in the repository since the last update would result in a conflict, that must explicitely be resolved by the SVN user.
>
> In that case the conflict editor would be opened for that file.

http://tortoisesvn.net/faq.html#noautomerge

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3000494
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].