Additions to git tips & tricks - recover from a botched PR job

[TraceyC77]

git fetch
gh pr checkout $PR_ID
git rebase origin/master
# Deal with conflicts
git push --force

OR

git checkout master && git pull
git cherry-pick $COMMIT_ID # get this from the PR
# Fix conflicts
git push
# Go back to PR and manually close it using the commit on master

OR (when the branch lives outside of the getsolus org)

git checkout master && git pull
gh pr checkout $PR_ID
git log # get the commit ID
git checkout master
git cherry-pick $COMMIT_ID
# Deal with conflicts
git push