HOWTO merge commits from the integration branch » History » Version 2
Loïc Dachary, 03/28/2015 11:36 AM
1 | 2 | Loïc Dachary | After the [[HOWTO run integration and upgrade tests|tests successfully]] run on the [[HOWTO populate the integration branch|integration branch]]: |
---|---|---|---|
2 | |||
3 | * Assign issues that have been backported and tested without interaction with the original author to the [[HOWTO#Leads|lead]] because he is the one deciding if it is relevant to backport it the way it was. |
||
4 | * Wait for all issues to be approved. |
||
5 | |||
6 | The backports from the integration branch can be merged (via github so that the pull requests are properly tagged as being merged) into the release branch. |
||
7 | 1 | Loïc Dachary | |
8 | * for each pull request merged in the integration branch |
||
9 | * go to the github web interface |
||
10 | * click on the "Merge button" |
||
11 | * add the "Reviewed-by:" field to the input box |
||
12 | * 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). |
||
13 | |||
14 | 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. |