Re: Disable auto merge

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 12 Mar 2010 12:33:51 +0000

2010/3/12 Huszti András <Andras.Huszti_at_knorr-bremse.com>:
> Hello!
>
> Does it make any sense to request a feature what enables to turn off auto mergeing feature?
>
> Sometimes it would be better to do an update where auto mergeing is turned off, and clearing all conflicts by hand.

http://tortoisesvn.tigris.org/faq.html#noautomerge

Simon

-- 
:       ___
:  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=2458663
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2010-03-12 13:33:56 CET

This message: [ Message body ]
Next message: Carsten Schuette: "Re: TortoiseSVN (nightly build 18837) still does not handle UTF-8 files during "Apply patch""
Previous message: Simon Large: "Re: How do I add the file to the ignore list without deleting it?"
In reply to: Huszti András: "Disable auto merge"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]