I've been following the steps as best I can here [1] to upgrade my package (qpid-proton) to the latest upstream release (0.9). However, these steps result in a merge commit (actually, they result in a huge set of conflicts) and that strikes me as a Bad Thing (tm). Why does GBP try to merge, rather than cherry pick, the upstream version onto master? That will always result in an error since upstream only holds the original code while master is interim changes to the package. What is the right way to go about this? [1] http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.NEW.UPSTREAM -- Darryl L. Pierce <mcpierce@gmail.com> http://mcpierce.blogspot.com/ Famous last words: "I wonder what happens if we do it this way?"
Attachment:
pgpobsMEX9EK2.pgp
Description: PGP signature