git merge ours code example

Example 1: git merge abort

git merge --abort

Example 2: git merge

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