Re: [gentoo-catalyst] rfc: merging catalyst git branches

[Peter Stuge]

Sebastian Pipping wrote:
> > 3) put the code on catalyst_2 on master.
> >
> > What about this?
>
> Either git commit-tree or forced push.

git commit-tree is the better way. Sometimes it is neccessary to
rewrite public history, but this is not one of those times.

Whenever it is not absolutely neccessary, it's better to do something
else on the branch than rewrite it - unless the branch is well known
to be rewritten (like a testing branch might be).

catalyst master is not a testing branch and shouldn't be rewritten.

William, please go with Sebastian's suggestion.


//Peter