Re: Incorrect merge

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Date: Fri, 05 Nov 2010 10:30:26 +0100
> 
> Lars Magne Ingebrigtsen <address@hidden> writes:
> 
> > 1) They're a pain in the ass, both to write and due to the constant
> > merge conflicts.
> 
> git-merge-changelog can help a lot here.

As can this bzr plugin:

  bzr branch lp:bzr-changelog-merge ~/.bazaar/plugins/changelog_merge

It is still experimental, see
https://lists.ubuntu.com/archives/bazaar/2010q3/070157.html and the
rest of that thread (it continues in 2010q4) for details.