A similar thing happened with inkscape development and bzr. I don't know what the fix was but here's the "Proper way of merging":
http://wiki.inkscape.org/wiki/index.php/Working_with_Bazaar#Proper_way_of_merging - Alex _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
