Re: merge conlict?

[Richard Stallman]

    > 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.  Should
only the maintainers, Stefan and Yidong, be able to do that?