Overview
Artifact ID: | a500eb526157c8844d69c5746694e821fa96dfc7 |
---|---|
Ticket: | 984d15b81114087e9ebd036b70161d1f14ea75fa
Merge conflict markers could be more helpful |
User & Date: | anonymous 2010-10-15 13:59:32 |
Changes
- Appended to comment:
<hr /><i>anonymous claiming to be Joerg Sonnenberger added on 2010-10-15 13:59:32:</i><br /> I agree that the markers at the moment are less helpful. Would it make sense to make them real prefixes? E.g. <verbatim> <<<< Working copy (version: XXX) ... ==== Conflict from version YYY .... >>> End of conflict between XXX and YYY </verbatim> Would that break any tools for conflict resolution?
- resolution changed to: "Open"