error: commit is not possible because you have unmerged files. astuce: Corrigez-les puis lancez 'git add/rm <fichier>' astuce: si nécessaire pour marquer la résolution et valider. fatal: Exiting because of an unresolved conflict. code example

Example 1: error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.

repo_clone $ git add file && git commit -m "resolved merge conflicts"
[master 39c3ba1] resolved merge conflicts

Example 2: error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.

both modified:   project/app/pages/file1/file.ts
both modified:   project/www/assets/file1/file-name.html