[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
mainline.
The no-no (AFAIU) is to push directly from such a feature branch to
the savannah repository.
- Re: merge conlict?, (continued)
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Richard Stallman, 2010/01/25
- Re: merge conlict?, Stephen J. Turnbull, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/26
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?,
Eli Zaretskii <=
- Re: merge conlict?, Lennart Borgman, 2010/01/26
- Re: merge conlict?, Karl Fogel, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Stephen J. Turnbull, 2010/01/26
- Re: merge conlict?, Richard Stallman, 2010/01/26
- Re: merge conlict?, Stefan Monnier, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Stefan Monnier, 2010/01/25