Re: merge conlict?

[Eli Zaretskii]

> From: Karl Fogel <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  address@hidden,  address@hidden
> Date: Tue, 26 Jan 2010 13:42:51 -0500
> 
> Lennart Borgman <address@hidden> writes:
> >This thread is over my head, I do not have time to capture the
> >details. Could the conclusions from the discussion (when it is
> >somewhat ready) please be put on the EmacsWiki page?
> 
> It's too long for me too.
> 
> But since some people may be expecting me to maintain BzrForEmacsDevs,
> this is an explicit request for someone who understands what the heck
> has been concluded here to please update the page if necessary!

There's nothing to update.  Everything is already there.  The problem
which started this was because the guilty parties didn't follow the
workflow described on the wiki to the letter.