Squashing multiple commits

Squashing multiple commits

1. git checkout -b squashed_branch
2. git rebase -i master
3. edit the file:

pick aaaaaaa commit message 1
pick bbbbbbb commit message 2
pick ccccccc commit message 3
...

->

pick aaaaaa commit message 1
squash bbbbbb commit message 2
squash cccccc commit message 3
...

4. if conflicts arise:

- git status ### see which file is messed up
- edit the affected file appropriately
- git add . ### git rm if you dont want the file anymore
- git rebase --continue
- repeat until no more conflicts