NEVER use `bzr push' for sending changes upstream (was: merge conlict?)

[Óscar Fuentes]

Eli Zaretskii <address@hidden> writes:

[snip]

> (Btw, address@hidden bounces.)

Mark did "merge & push" twice, so it is very likely that that is his
usual workflow. It is *very* damaging for the VC history.

If Mark can't be contacted for telling him to correct his bzr workflow,
his commit rights should be removed. Hopefully he will come here to ask
why he can't commit and then we will explain the problem to him.