Merging Cleanly

Unfortunately, git doesn't have something like git merge --no-conflicts.

However, to allow any non-conflicting merges to take place (fast-forward, recursive, etc.), take advantage of git's exit codes with something like:

git merge || git merge --abort

You can even add it to your git aliases:

merge-clean = !"git merge $@ || git merge --abort"