Feedback on merging via bzr

[James Westby]

On Sun, 17 Jan 2010 23:35:05 -0500, Andrew SB <a.starr.b at gmail.com> wrote:
> Ideally, the script would also produce something along the lines of
> MoM's REPORT, listing the conflicts and giving instructions on how to
> proceed.

I'm working on something to do this centrally to replace
merges.ubuntu.com, but it's not ready for use yet.

I'm not sure writing a file when used locally would be all that useful
would it?

Thanks,

James