On Wed, Apr 22, 2009 at 1:35 AM, Sam Thursfield <[email protected]> wrote: > Hello! > On Tue, Apr 21, 2009 at 6:36 PM, Cody Russell <[email protected]> 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/[email protected]/msg09183.html > > It's summed more succinctly in this blog post: > http://i-nz.net/2009/03/19/git-automatic-smart-changelog-merging/
That applies only for 'git merge', not for other commands such as 'git am' or 'git rebase'. -- Felipe Contreras _______________________________________________ desktop-devel-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/desktop-devel-list
