Working with PRs

Testing locally

Sometimes people will fork your repo, make some changes and submit a pull request. You'll then want to test the pull request locally before accepting/merging.

To do that I do the following

# create a new branch
git checkout -b <branchname>
# or (with alias)
git cob <branchname>

# then pull the PR into this new branch
git pull origin pull/<PR id>/head

I'm not sure if there is a better way but this approach has worked for me in the past. I got this from this stackoverflow thread.

Cherry picking

Turns out you can also cherry pick commits from a PR. This might be useful if you miss a PR and have made some of the same changes.

To cherry pick a commit

git cherry-pick <commit_hash>