Skip to content

Instantly share code, notes, and snippets.

@Aldaviva

Aldaviva/pull-requests.md

Created August 5, 2017 12:23
Show Gist options
  • Save Aldaviva/dfc67b91484ee492be90172ff9a85f12 to your computer and use it in GitHub Desktop.
Save Aldaviva/dfc67b91484ee492be90172ff9a85f12 to your computer and use it in GitHub Desktop.
Download ZIP
How to modify and merge GitHub pull requests
Raw
pull-requests.md
  1. Clone your repo.
  2. curl -L https://github.com/Aldaviva/webscale/pull/3.patch | git am -3
  3. If there are merge conflicts, fix them, then git am --continue.
  4. Make any local changes you want.
  5. git add -A
  6. Commit your changes with Closes #3 at the end of the commit message.
    • git commit --amend (to modify the pull request commit)
    • git commit (to add a new commit of you own).
  7. If you want to squash multiple WIP commits into one, use git rebase -i origin/master.
  8. Push.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment