Hi, On Tue, Mar 22, 2016 at 12:57:02AM -0700, Afif Elghraoui wrote: > Package: git-buildpackage > Version: 0.6.22 > Severity: wishlist > > dpkg-mergechangelogs (from the dpkg-dev package) is a very nice tool > that allows git to automatically merge debian/changelogs. > It is especially useful when updating backports branches, as usually the > changelog is the only thing causing a merge conflict. > > Configuring it is very simple [1], but it is best done at the time of > repository creation. > I'm therefore suggesting that `gbp clone` and maybe even a `gbp init` add > the necessary lines in the .git directory to make this automatic. > > > If the suggestion here will be accepted, I might prepare a patch to implement > it if needed. Please let me know.
I think that's a great idea. It's been on my todo list to add this to gbp-clone for a long time. Cheers, -- Guido
