"multi-part" merge with conflicts does not "bail out with an error message"
From: Brazhnik <brazhnik_at_gmail.com>
Date: Wed, 12 Nov 2008 20:11:07 +0300
Hello.
from the section "Advanced Merging," side note regarding doing a merge which
"Did you notice how, in the last example, the merge invocation caused two
but the svn 1.5.4 continues applying second range of changes if first range
in other way the conflicted file looks like usual (without nested <<<, ===,
---- brazhnikReceived on 2008-11-12 18:28:43 CET |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.