Michael Olson <[EMAIL PROTECTED]> writes: > It was not terribly hard to deal with this particular case. Pull > patches from Stefan, notice a few conflicts, remove his version of the > conflicted files, use C-x V = to see whether my changes still make > sense, do M-x bzr-submit-patch again.
No, it's not _terribly hard_. But if you have a better tool, why not use it? Solving this kind of conflicts is a loss of time for everybody, and it should just not have to happen ... -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
