| 1 |
On Sun, Jun 24, 2012 at 7:33 PM, Sebastian Pipping <sping@g.o> wrote: |
| 2 |
> On 12/10/2011 11:15 PM, Sebastian Pipping wrote: |
| 3 |
>> [T]he full run on my shell: |
| 4 |
>> |
| 5 |
>> # git branch catalyst_3 master |
| 6 |
>> |
| 7 |
>> # git checkout master |
| 8 |
>> |
| 9 |
>> # git merge $(git commit-tree catalyst_2^{tree} \ |
| 10 |
>> -p catalyst_2 -p master \ |
| 11 |
>> <<<"Replace content on master with content from catalyst_2") |
| 12 |
>> |
| 13 |
>> # git push origin master |
| 14 |
>> |
| 15 |
>> # git push origin catalyst_3 |
| 16 |
>> |
| 17 |
>> |
| 18 |
>> Results is: |
| 19 |
>> |
| 20 |
>> - 2.x content on branch master (and catalyst_2) |
| 21 |
>> |
| 22 |
>> - 3.x content on branch catalyst_3 |
| 23 |
> |
| 24 |
> This procedure above is still left to do. Any objections? |
| 25 |
> With no objections, I will go forward on next monday (2012-07-02). |
| 26 |
|
| 27 |
If you're confident it'll work -- please proceed. No use in waiting. |
Archives