How to do Interactive Rebase, how to do squash-and-merge

interactive rebase squash-and-merge.md

How to do Interactive Rebase, how to do squash-and-merge

• Rebase Interactive or Squash your commits are the same thing
• Squash and Merge is different (we will discuss that in another file)

git rebase -i HEAD~2

• If you encounter a conflict, then, resolve it
• Add the conflict-free files by doing the following:

git add .
git rebase --continue

• If it prompts you that no files were detected then, instead of --continue, use --skip