GIT 4_ Gérer un conflit

wilder@wilder-ThinkPad-T440p:~/work/Exo_et_cours/git/test2$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From github.com:Lio-code/test2
   a52351a..fca3982  master     -> origin/master
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

(modification du fichier directement dans VSCODE)

wilder@wilder-ThinkPad-T440p:~/work/Exo_et_cours/git/test2$ git add .

wilder@wilder-ThinkPad-T440p:~/work/Exo_et_cours/git/test2$ git commit -m "resolve conflict"
[master dc4fbd7] resolve conflict

wilder@wilder-ThinkPad-T440p:~/work/Exo_et_cours/git/test2$ git pull
Already up to date.

wilder@wilder-ThinkPad-T440p:~/work/Exo_et_cours/git/test2$ git push origin master
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 448 bytes | 448.00 KiB/s, done.
Total 4 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), done.
To github.com:Lio-code/test2.git
   fca3982..dc4fbd7  master -> master