how to merge files in git code example

Example 1: git merge tag to branch and squash commits

git checkout master
git merge --squash tag
git commit

Example 2: git Automatic merge failed; fix conflicts and then commit the result

$ git status

$ git add .

$ git commit -a "Comment"