Quête Git 5

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main)
$ git add .

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main)
$ git commit -m "tast"
[main 0208152] tast
 1 file changed, 1 insertion(+), 1 deletion(-)

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main)
$ git pull
Already up to date.

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main)
$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 648 bytes | 49.00 KiB/s, done.
From https://github.com/JenniferHomsy/Push-pull
   b03a58b..41e4933  main       -> origin/main
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main|MERGING)
$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You 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:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main|MERGING)
$ git add README.md

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main|MERGING)
$ git commit -m "gerer modif"
[main c5f9046] gerer modif

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main)
$ git pull
Already up to date.

jenho@LAPTOP-Q90KLVS3 MINGW64 ~/Documents/Push-pull (main)
$ git push
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (6/6), 540 bytes | 270.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/JenniferHomsy/Push-pull.git
   41e4933..c5f9046  main -> main