Multiple conflicts while postponing conflict resolution across multiple merged commits
From: Rick Ramstetter <rick.ramstetter_at_gmail.com>
Date: Tue, 21 Feb 2012 16:48:12 -0800
A question regarding the handling of multiple conflicts while
Let's say I merge two commits from trunk to a branch:
Each of those merged commits (c1 and c2) causes a content (aka "Text")
If I run:
... Then I'm left in a situation where SVN has marked the conflicts as
Another SVN user bumped into this situation here:
Is any related development in progress or in planning? More
In my example above, I'm using SVN 1.6.12.
Thanks in advance for all responses,
-- J. Rick Ramstetter http://paul.rutgers.edu/~jramstet My @cs.rutgers.edu email address is forwarded to my @gmail.com address.Received on 2012-02-22 01:48:44 CET
This is an archived mail posted to the Subversion Users mailing list.