Re: bzr send workflow

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Date: Sun, 22 Aug 2010 14:29:00 +0200
> Cc: Bojan Nikolic <address@hidden>, address@hidden
> 
> Stefan Monnier <address@hidden> writes:
> 
> > Before we can switch to such a system, we need to get rid of the
> > ChangeLog files (which are otherwise a constant source of spurious
> > conflicts which make such a workflow impractical).
> 
> Pretty much a non-issue with git-merge-changelog (from gnulib).

You mean, use it with bzr via the extmerge plug-in?

And btw, it sounds a simple job to write an Emacs command that would
resolve such conflicts in a ChangeLog file and commit the result.