Home

Welcome to the sprocket wiki!

How to merge after creating Pull Request

We assume 'PRbranch' is a branch which was already lined up at the pull request and reviewed.

git checkout PRbranch
git rebase -i HEAD~N  # Integrate N commit into one or several commit 
git fetch origin # featch origin/master into local
git rebase origin/master # solve conflict between PRbranch and origin/master
git push -f origin PRbranch # forced to merge origin/PRbranch

Finally, the PRbranch is merged into origin/master using a button of Merge in pull request page.