- Get the new commits and put yours on top
git pull --rebaseStopped with a conflict? Fix the files, run git add on them, then git rebase --continue.
- Push
git push
Check it worked
- Check you're in step with GitHub
git status
Undo it
- Stop the rebase if it goes wrong
git rebase --abort
- Get the new commits and put yours on top
git pull --rebaseStopped with a conflict? Fix the files, run git add on them, then git rebase --continue.
- Push
git push
Check it worked
- Check you're in step with GitHub
git status
Undo it
- Stop the rebase if it goes wrong
git rebase --abort
- Get the new commits and put yours on top
git pull --rebaseStopped with a conflict? Fix the files, run git add on them, then git rebase --continue.
- Push
git push
Check it worked
- Check you're in step with GitHub
git status
Undo it
- Stop the rebase if it goes wrong
git rebase --abort