Squash commits when you have merge commits in between

squash_commits.md

Squash commits when you have merge commits in between

Let's assume that the feature branch is called feature and the main branch main:

1. Create a temporary (say temp) branch from main:

git checkout -b temp main

2. Squash the feature branch in:

git merge --squash feature

3. Commit the changes (the commit message contains all squashed commit messages)

git commit

4. Go back to the feature branch and point it to the temp branch:

git checkout feature
git reset --hard temp

5. Delete the temporary branch:

git branch -d temp

6. Push your changes to the remote branch

git push origin feature --force