Re: merge conlict?

[Lennart Borgman]

On Tue, Jan 26, 2010 at 6:50 PM, Eli Zaretskii <address@hidden> wrote:
>> From: Richard Stallman <address@hidden>
>> Date: Tue, 26 Jan 2010 11:49:46 -0500
>> Cc: address@hidden, address@hidden
>>
>>     Distinguishing between trunk->branch merges that are useful and those
>>     that merely create unreadable history (as displayed by bzr) requires
>>     fine judgment.
>>
>> Should only the maintainers, Stefan and Yidong, be able to do
>> trunk->branch merges?
>
> No!  Every developer who works on a feature in a separate branch needs
> to do that from time to time, to avoid diverging too much from
> mainline.
>
> The no-no (AFAIU) is to push directly from such a feature branch to
> the savannah repository.


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?