need a good way to see and fix merge errors.
Registered by
Dennis Schwertel
something like:
file1-- keep local -- keep remote -- interactive merge
file2-- keep local -- keep remote -- interactive merge
the interactive merge should be a nice external editor
Blueprint information
- Status:
- Not started
- Approver:
- None
- Priority:
- Undefined
- Drafter:
- None
- Direction:
- Needs approval
- Assignee:
- None
- Definition:
- Approved
- Series goal:
- None
- Implementation:
-
Unknown
- Milestone target:
- None
- Started by
- Completed by
Related branches
Related bugs
Sprints
Whiteboard
(?)
