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

Re: SV: SV: SV: Force option for merges

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 11 Jun 2009 18:26:13 +0200

Hans-Emil Skogh wrote:
> [About the "Force merge" option]
>>> In my view, any (implicit) removal of local changes without asking is a
>>> really bad thing. It should not be scary to use SVN.
>> Changed the option for 1.6.x in r16564.
> Great!
> I'm still thinking about a hint for the option in the nightly build. Or
> maybe even add some note to the label. Just to make it clear that it is
> not a good idea to make a habit out of checking the force-option there.
>>>>> How about "Silently delete locally modified files if deleted in
>>>>> repository"?
> ...or maybe "Delete local modifications if conflicts arise"
> or "Automatically resolve all conflicts using 'theirs', discarding local
> changes".

I went with "Discards local changes upon incoming deletes".


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-06-11 18:26:24 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.