merge branch up to commit code example

Example 1: git merge tag to branch and squash commits

git checkout master
git merge --squash tag
git commit

Example 2: git merge

$ git checkout master
Switched to branch 'master'
$ git merge iss53