Re: On autogenerated ChangeLog

[Sam Thursfield <ssssam gmail com>]

Hello!
On Tue, Apr 21, 2009 at 6:36 PM, Cody Russell <bratsche gnome org> wrote:
> No, but the point is that if you edit some code and someone else has
> made changes to some code elsewhere in the repo, and you merge their
> work into yours.. then maybe you have to fix some conflicts, but maybe
> not.  If you have already added ChangeLog entries and someone else
> commits something before you commit then you have to resolve conflicts
> in your ChangeLog 100% of the time.

This problem was solved by Bruno Haible, who presents a git merge
driver designed specifically for ChangeLog files, in a thread similar
to this one: http://www.mail-archive.com/bug-gnulib gnu org/msg09183.html

It's summed more succinctly in this blog post:
http://i-nz.net/2009/03/19/git-automatic-smart-changelog-merging/

Sam