Changes between Version 2 and Version 3 of GitHubPullRequests

Timestamp:

May 24, 2015, 7:28:48 AM (9 years ago)

Author:

Karl Egly

Comment:

reorder cherry-picking and merging, because the latter has better integration

GitHubPullRequests

@@ -15 +15 @@
 }}}
 
-Using the GitHub pull request page, check the commit you want to get and simply do:
-{{{
-git cherry-pick -s sha1_commit
-}}}
-
-If the contribution consists of multiple commits on a separate branch off master for just this pull request, then you can merge that remote branch with:
+If the contribution consists of a separate branch off master for just this pull request, then you can merge that remote branch with:
 {{{
 git merge reponame/branchname
 }}}
 
-An alternative way is using the GitHub instructions:
-https://help.github.com/articles/merging-a-pull-request#merging-locally
-
+In case you want to only pick some commits of the contribution you can check the commit you want to get at the GitHub pull request page and simply do:
+{{{
+git cherry-pick -s sha1_commit
+}}}
+Notice that the latter will not automatically close the pull request.