[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 20 Sep 2013 17:45:49 +0200

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-20 17:46:03 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.