I don't know if folk are aware, but plugins - like the ones we use for lp-review and so on - can extend bzr's merge facilities, so that it can implement our import policy on merges; avoiding all conflicts (or more than the core textual merge can do).
Just a thought. -Rob _______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
