Project

General

Profile

HOWTO merge commits from the integration branch » History » Version 1

Loic Dachary, 03/26/2015 11:49 AM

1 1 Loic Dachary
After the [[HOWTO run integration and upgrade tests|tests successfully]] run on the [[HOWTO populate the integration branch|integration branch]], the backports it contains can be merged (via github so that the pull requests are properly tagged as being merged) into the release branch. 
2 1 Loic Dachary
3 1 Loic Dachary
* for each pull request merged in the integration branch
4 1 Loic Dachary
* go to the github web interface
5 1 Loic Dachary
* click on the "Merge button"
6 1 Loic Dachary
* add the "Reviewed-by:" field to the input box
7 1 Loic Dachary
* when all issues are merged **git log --no-merges giant-backports ^giant** must be empty (i.e. the integration branch must have nothing left except diverging merges because all cherry-picked commits are now found in the giant branch).
8 1 Loic Dachary
9 1 Loic Dachary
Since the merge is not from the integration branch, the commit that has been tested won't match the SHA which is inconvenient when trying to figure out if a mistake has been done. The content of the integration branch should be merged with a script instead of manually via the github web interface to avoid mistakes.