Re: Keep "Thier" file

AMP wrote:
> Hello,
> I have 2 files that are in conflict.
> I want to keep the "Thiers" file. I dont want to merge each line by
> hand.
> How do I do that?
> Thanks
> Mike
>
"Resolve using theirs", which doesn't show up in the shell menu but does
from check for modifications and from the update progress dialog.

or...
"revert"

But there is a subtle difference, "Resolve using theirs" actually uses
the theirs file, including any edits you've made to it. If you haven't
edited then the two are identical except perhaps in the behaviour of
time stamps.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=981139

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-08 14:30:22 CET