kicad-developers team mailing list archive

[Alex Leone <acleone@xxxxxxxxx>]

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