La fusion automatique GIT a échoué; réparer les conflits et ensuite commettre le résultat
$ git status
$ git add .
$ git commit -a "Comment"
$ git status
$ git add .
$ git commit -a "Comment"$ git statusOn branch masterYou have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge)Unmerged paths:(use "git add <file>..." to mark resolution)both modified: merge.txt