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

[Sebastian Pipping]

On 06/25/2012 06:04 AM, Matt Turner wrote:
> On Sun, Jun 24, 2012 at 7:33 PM, Sebastian Pipping <sping@g.o> wrote:
>> 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).
>
> If you're confident it'll work -- please proceed. No use in waiting.

Done.

Best,



Sebastian