Re: merge conlict?

[Stefan Monnier]

>> 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