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

On 18.09.2013 23:22, Greg Creager wrote:
> I have files that did not get merged due to a tree-conflict so I am going back and remerging them.
>
> I have to 'ingnore' ancestry in order for it to 'redo' the merge.
>
> I selected this option and got an error message saying ignore ancestry cannot be used with an automatic merge.
>
> Is the only option merge two different tree's now? I used to be able to use this option on the normal merge.

To redo a merge, ignoring ancestry won't help since the merge is already
recorded. You have to force the merge.

Stefan

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