[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Stefan Monnier |
Subject: |
Re: merge conlict? |
Date: |
Tue, 26 Jan 2010 20:18:33 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
>> 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.
> Sorry, it is the push from a branch that caused the confusion.
Yes.
> Should only the maintainers, Stefan and Yidong, be able to do that?
I'd say "not even".
Basically, instead of "push" to the trunk, the right way is to "merge"
from some other branch onto the trunk.
In any case, the .bzr/branch/branch.conf modification should ensure that
such errors don't happen any more.
Stefan
- Re: merge conlict?, (continued)
- 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, 2010/01/26
- 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 <=
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Stefan Monnier, 2010/01/25
- 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?, Andreas Schwab, 2010/01/26
- Re: merge conlict?, Andreas Schwab, 2010/01/26
Re: merge conlict?, Teemu Likonen, 2010/01/25