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

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".

Stefan

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