- Make sure you have the latest code
git fetch --all
git log
- start rebasing. If you have a feature branch you want to merge, you might rebase off dev. If you simply want to squash a few commits together, you might rebase off of a specific head location.
git rebase -i origin/dev // (rebase off of another branch)
git rebase -i HEAD~5 // (rebase off HEAD @ previous 5 commits)
- Pick your commits that you want to pick or squash. normally you would 'pick' the first, and 'squash' the rest
pick 01d1124 Added hello.js
squash 6340aaa Added some tests
squash ebfd367 Added some logic
squash 30e0ccb Fixed some bugs
- Deal with merge conflicts
<fix stuff here>
git add .
git rebase --continue
- Squash and summarize your commit messages
Added hello feature
- Verify that you have the correct squashed commmit
git log
- Force push
git push -f origin my_branch
- If at any point you are confused, abort!
git rebase --abort
