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

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 23 Aug 2012 16:55:28 +0200

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.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-23 16:55:55 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.