Comment 12 for bug 40412
Revision history for this message
| GuilhemBichot (guilhem-bichot) wrote Re: show-base for weave merge | #12 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
Hello John. I looked at your branch, but couldn't make it generate the .BASE file (I tried "--weave" and "--weave -Dmerge"; "--weave --show-base" was rejected with error). What command line should I use, please?
Regarding putting the base inline or as a BASE file to be used with a GUI 3-way file merge tool, my point was that the inline blocks put by bzr seemed superior to what 3-way file merge tools do (ldue to a difference between traditional diff and patiencediff??). Which is why I wondered if the inline base wouldn't give better conflict solving.
But if the 3-way file merge tools do a good enough job... fine with me!