wiki:GitHubPullRequests

Version 2 (modified by Karl Egly, 8 years ago) (diff)

add command to handle a pull request by merging the branch

You have been assigned a GitHub? pull request to cherry-pick or merge the changes do the following:

git remote add reponame URL

Like so:

git remote add knowledgejunkie https://github.com/knowledgejunkie/mythtv.git

Then fetch the content:

git fetch reponame

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:

git merge reponame/branchname

An alternative way is using the GitHub? instructions: https://help.github.com/articles/merging-a-pull-request#merging-locally