Martin Pool <mbp at canonical.com> writes: > Vincent is working on the general area of conflicts and has some notes > in <http://wiki.bazaar.canonical.com/VincentLadeuil/ConflictResolution>