git how to do a merge deconfliction code example

Example 1: git stop merge

git reset --hard HEAD

Example 2: git merge tag to branch and squash commits

git checkout master
git merge --squash tag
git commit