Re: merge conlict?

[Stephen J. Turnbull]

Richard Stallman writes:
 >     If my guess is right, Mark merged trunk into his private branch, and
 >     then pushed to upstream, which is very wrong.
 > 
 > If we think this is wrong practice, can we customize something so that
 > it isn't allowed?

No.  Merging from trunk to branch is often very useful for any of
several reasons, and merging from branch to trunk is necessary (that's
how new code gets into trunk and becomes available to the community).
It would be a very bad idea to forbid either kind of merge.

Distinguishing between trunk->branch merges that are useful and those
that merely create unreadable history (as displayed by bzr) requires
fine judgment.  Any automated gatekeeper would simply frustrate people
working on branches (and maybe those working directly on the trunk,
too, at least until the bugs are worked out).