[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conlict?

From: Óscar Fuentes
Subject: Re: merge conlict?
Date: Tue, 26 Jan 2010 11:06:57 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]