[Top][All Lists]

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

Re: merge conlict?

From: Eli Zaretskii
Subject: Re: merge conlict?
Date: Tue, 26 Jan 2010 06:25:34 +0200

> From: "Stephen J. Turnbull" <address@hidden>
> Date: Tue, 26 Jan 2010 10:49:53 +0900
> Cc: Óscar Fuentes <address@hidden>, address@hidden
> 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.

I think Richard was asking about pushing from a private branch, not
about merging.  At least, AFAIU, this is the part that Óscar said was
very wrong.

reply via email to

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