resolve conflicts git discard code example

Example: git undo comflicted merge

git merge --abort