git checkout master
git pull
git merge V8_9-gt9999-branch # ADD THE GITTRAC TICKET NUMBER TO MERGE COMMIT MESSAGE!!
-git push master
+git push origin master
{endsnip}
Then, if the pull request was made from master but should also apply to the stable branch (because it's a bug fix), then cherry-pick the commit back to the correct branch. *There may be more than one commit in a pull request.* If this is the case, make sure you do them in the correct order. If you are picking into a release branch consult with TimT and TJ first.
@@ -52,7 +52,7 @@
git cherry-pick <commit-hash-1> # ADD THE GITTRAC TICKET NUMBER TO CHERRY-PICK COMMIT MESSAGE!!
git cherry-pick <commit-hash-2> # ADD THE GITTRAC TICKET NUMBER TO CHERRY-PICK COMMIT MESSAGE!!
...
-git push V8_8-branch
+git push origin V8_8-branch
{endsnip}
@@ -61,11 +61,11 @@
git checkout V8_8-branch
git pull
git merge V8_8-gt9999-branch # ADD THE GITTRAC TICKET NUMBER TO MERGE COMMIT MESSAGE!!
-git push V8_8-branch
+git push origin V8_8-branch
git checkout master
git pull
git merge V8_8-branch
-git push master
+git push origin master
{endsnip}
{linebreak}