Automatic merge failed; fix conflicts and then commit the result.
When running git pull to pull changes from a remote repository, there could well be changes in the remote and your local repo. This causes conflits and git will fail to merge. You will see the error Automatic merge failed; fix conflicts and then commit the result. Fortunately in git >...