[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conlict?

From: Eli Zaretskii
Subject: Re: merge conlict?
Date: Tue, 26 Jan 2010 19:50:36 +0200

> 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

The no-no (AFAIU) is to push directly from such a feature branch to
the savannah repository.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]