RE: Re: Merge problem SVN 1,8
From: Markus Humm <markus.humm_at_de.ebmpapst.com>
Date: Fri, 4 Jul 2014 05:02:45 -0700 (PDT)
Hello,
since we do not want to do a automatic merge, we do not need a 3-way diff/merge tool. For us it would be sufficient if there would be a mode where Tortoise would call WinMerge with the current version from WC/trunk/branch and the current version from the branch which shall be merged into that WC/trunk/branch.
It was also mentioned, that my foo.c would contain conflict markers. When I select "resolve later" in the progress dialog and look at all 4 files (.c, .r1183, .r1188 and .working) none contains anhy conflict markers!
Regards
Markus
------------------------------------------------------
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.