RE: Re: 1.8, Ignore Ancestry in Merge Range does not work

> So use the automatic merge option and select force? I understand that will auto
> delete local files if the source deletes them, but will it still use merge history?
> Meaning the merge has already happened so it won't do anything?
>
>
> My scenario is this:
> 1) do the merge, have a file that is a tree conflict, select keep local (it was
> added in both places)
>
> 2) Now I need to redo the merge for that file to make sure I got the contents
> from the source.
>
> What is the correct way to do that?

Generally you would make that merge manually, using WinMerge or Beyond Compare or whatever before you commit the merge.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-20 18:08:16 CEST