Automatic merge failed; fix conflicts and then commit the result. git add . git commit -m "commit info"