HOWTO populate the integration branch » History » Version 2
Loïc Dachary, 03/26/2015 10:50 AM
| 1 | 1 | Loïc Dachary | h3. Collect pending pull requests into an integration branch |
|---|---|---|---|
| 2 | |||
| 3 | The snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/4 can help |
||
| 4 | |||
| 5 | 2 | Loïc Dachary | * create a giant-backport branch if it does not already exists |
| 6 | * reset it to ceph/giant |
||
| 7 | 1 | Loïc Dachary | * fetch all pull requests from github |
| 8 | * git merge all pull requests |
||
| 9 | * modify the pull requests individually to fix merge conflicts (i.e. they must merge cleanly, which may involving aggregating two pull requests into a single one designed to properly resolve the conflict) |
||
| 10 | * compile with ./autogen.sh ; ./configure ; make -j4 |
||
| 11 | * modify the pull requests individually to fix compilation errors |