Skip to content

Instantly share code, notes, and snippets.

@foliea

foliea/Rebasing.md

Last active August 29, 2015 14:10
Show Gist options
  • Save foliea/1ff656711a1314033883 to your computer and use it in GitHub Desktop.
Save foliea/1ff656711a1314033883 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Rebasing.md

  1. Add upstream repo:

    git remote add upstream https://github.com/grounds/grounds.io.git

  2. Start rebasing

    git fetch upstream
git rebase -i upstream/master

  3. Fix merge issues

  4. End rebasing

    git add -A
git rebase --continue

  5. Update pull request

    git push -f origin <your_branch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment