Skip to content

Instantly share code, notes, and snippets.

@BerkeleyTrue
Forked from jeffbcross/rebase-merge.sh
Created October 9, 2015 07:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save BerkeleyTrue/40abfadeda097abc3ff3 to your computer and use it in GitHub Desktop.
Save BerkeleyTrue/40abfadeda097abc3ff3 to your computer and use it in GitHub Desktop.
How angular merges PRs
#See fetch_pr script https://gist.github.com/vojtajina/5538170
# fetch and checkout PR branch from "upstream" remote
fetch_pr 123
git fetch upstream
# Replay changes on top of master
git rebase upstream/master
# Replace upstream/master with this branch
git push upstream pr-123:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment