git not letting me merge without a commit code example Example: git merge tag to branch and squash commits git checkout master git merge --squash tag git commit