squash commits in merge commit code example
Example 1: squash commits in git
git reset --soft HEAD~3 &&
git commitExample 2: git merge tag to branch and squash commits
git checkout master
git merge --squash tag
git commitgit reset --soft HEAD~3 &&
git commitgit checkout master
git merge --squash tag
git commit