Lots of conflicts when trying to merge protobuf to maverick

Robert Collins robertc at robertcollins.net
Tue Jun 8 23:24:12 BST 2010


Hi Elliot, as we discussed on IRC - please make this a bug, and also
store the two branches somewhere so that the package importer won't
destroy the evidence. There's clearly something wrong, even if its
just data, we should fix it and make it more obvious whats up.

-Rob



More information about the ubuntu-distributed-devel mailing list