Fossil SCM
Merge conflict markers could be more helpful
984d15b81114087…
· opened 15 years, 5 months ago
- Type
- Feature_Request
- Priority
- —
- Severity
- Minor
- Resolution
- Works_As_Designed
- Subsystem
- —
- Created
- Oct. 15, 2010 9:06 a.m.
It isn't easy to understand which conflicting version is which.
CVS puts version information into markers:
<<<<<<< PLIST @comment $NetBSD$ ======= @comment $NetBSD: PLIST,v 1.28 2010/09/13 12:43:16 asau Exp $ >>>>>>> 1.28
meaning that the text below the opening marker is fresh, and the text above the closing marker comes from revision 1.28.
It would be nice to see Fossil behaving in a similar way, e.g. putting version id and/or time stamp in conflict marker.
anonymous claiming to be Joerg Sonnenberger added on 2010-10-15 13:59:32: I agree that the markers at the moment are less helpful. Would it make sense to make them real prefixes? E.g.
<<<< Working copy (version: XXX)
...
==== Conflict from version YYY
....
>>> End of conflict between XXX and YYY
Would that break any tools for conflict resolution?
anonymous added on 2010-10-15 14:11:30: I expect adapting tools to handle version on "===" harder than adapting code that handles them on ">>>".
Not to mention changing user habits when doing the same visually.