git conflicts decide which to keep code example

Example: git undo comflicted merge

git merge --abort