RE: Re: 1.8, Ignore Ancestry in Merge Range does not work
From: Greg Creager <greg.creager_at_hp.com>
Date: Fri, 20 Sep 2013 08:57:56 -0700 (PDT)
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:
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?
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
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.