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?
On Mon, Oct 15, 2012 at 10:05 AM, Mark Wielaard <m...@klomp.org> wrote: > I am using this: > https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/ That does not seem to do the right thing with "git cherry-pick", I'm afraid. It merges the full ChangeLog as opposed to the part that actually changed so we get stale entries in the file from earlier (unpicked) commits...
