On Mon, 2012-10-15 at 09:31 +0300, Pekka Enberg wrote: > That said, we really need to do something with ChangeLog because it > causes unnecessary rejects when merging from one git tree to another. > Can we drop it or did someone have some Git magic to deal with it?
I am using this: https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/ Cheers, Mark
