confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)

$ git pull https://github.com/INGRIDPRUVOST/challenge

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), 742 bytes | 32.00 KiB/s, done.

From https://github.com/INGRIDPRUVOST/challenge

 * branch            HEAD       -> FETCH_HEAD

Auto-merging README.md

CONFLICT (content): Merge conflict in README.md

Automatic merge failed; fix conflicts and then commit the result.

 

confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main|MERGING)

$ git add README.md

 

confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main|MERGING)

$ git commit -m "résolution du conflit"

[main bae96b6] résolution du conflit

 

confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)

$ git pull https://github.com/INGRIDPRUVOST/challenge

From https://github.com/INGRIDPRUVOST/challenge

 * branch            HEAD       -> FETCH_HEAD

Already up to date.

 

confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)

$ git push https://github.com/INGRIDPRUVOST/challenge main

Enumerating objects: 8, done.

Counting objects: 100% (8/8), done.

Delta compression using up to 8 threads

Compressing objects: 100% (3/3), done.

Writing objects: 100% (4/4), 479 bytes | 239.00 KiB/s, done.

Total 4 (delta 1), reused 0 (delta 0), pack-reused 0

remote: Resolving deltas: 100% (1/1), done.

To https://github.com/INGRIDPRUVOST/challenge

   0f60371..bae96b6  main -> main

 

confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)

$