Project

General

Profile

Actions

HOWTO populate the integration branch » History » Revision 2

« Previous | Revision 2/31 (diff) | Next »
Loïc Dachary, 03/26/2015 10:50 AM


Collect pending pull requests into an integration branch

The snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/4 can help

  • create a giant-backport branch if it does not already exists
  • reset it to ceph/giant
  • fetch all pull requests from github
  • git merge all pull requests
  • 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)
  • compile with ./autogen.sh ; ./configure ; make -j4
  • modify the pull requests individually to fix compilation errors

Updated by Loïc Dachary about 9 years ago · 2 revisions