git merge —abort

If you perhaps weren’t expecting conflicts and
don’t want to quite deal with the situation yet,
you can simply back out of the merge with

git merge --abort