**Simple** solution without rebase : ```git reset --soft HEAD~2 ``` ```git commit -m "new commit message"``` ```git push --force``` 2 means the last two commits will be squashed. You can replace it by number