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

[Sebastian Pipping <sping@gentoo.org>]

On 12/10/2011 11:15 PM, Sebastian Pipping wrote:
> [T]he full run on my shell:
> 
>  # git branch catalyst_3 master
> 
>  # git checkout master
> 
>  # git merge $(git commit-tree catalyst_2^{tree} \
>      -p catalyst_2 -p master \
>      <<<"Replace content on master with content from catalyst_2")
> 
>  # git push origin master
> 
>  # git push origin catalyst_3
> 
> 
> Results is:
> 
>  - 2.x content on branch master (and catalyst_2)
> 
>  - 3.x content on branch catalyst_3

This procedure above is still left to do.  Any objections?
With no objections, I will go forward on next monday (2012-07-02).

Best,



Sebastian