Comment 6 for bug 40412
Revision history for this message
| GuilhemBichot (guilhem-bichot) wrote Re: show-base for weave merge | #6 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
Sorry for late reply, I had forgotten to subscribe to this bug.
When using --weave, we usually look at the conflict in an editor, look at TREE and MERGE-SOURCE blocks, and resolve. So it would be best if the BASE block was visible in that place, written close to those blocks. Rather than having to open the ".plan" file and parse it. So I would go for (3) if not too hard.