Re: merge conlict?

[Óscar Fuentes]

"Stephen J. Turnbull" <address@hidden> writes:

> 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 [snip]

The problem is `merge && push', not `merge && commit'. Stefan already
asked about this on the bzr ml and it seems that there is a method for
disabling just that.