conflits git:(main) git pull origin main

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), done.

From https://github.com/FabienBataille/conflits

 * branch            main       -> FETCH_HEAD

   3b4a968..57f7ae1  main       -> origin/main

Auto-merging README.md

CONFLICT (content): Merge conflict in README.md

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

➜  conflits git:(main) ✗ git commit -m "changement"

U       README.md

error: Committing is not possible because you have unmerged files.

hint: Fix them up in the work tree, and then use 'git add/rm <file>'

hint: as appropriate to mark resolution and make a commit.

fatal: Exiting because of an unresolved conflict.

➜  conflits git:(main) ✗ git add README.md

➜  conflits git:(main) ✗ 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)

 

All conflicts fixed but you are still merging.

  (use "git commit" to conclude merge)

 

Changes to be committed:

        modified:   README.md

 

➜  conflits git:(main) ✗ git commit -m "changement"

[main 6f3e0ce] changement

➜  conflits git:(main) git push origin main

Enumerating objects: 10, done.

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

Delta compression using up to 4 threads

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

Writing objects: 100% (6/6), 635 bytes | 635.00 KiB/s, done.

Total 6 (delta 0), reused 0 (delta 0)

To https://github.com/FabienBataille/conflits.git

   57f7ae1..6f3e0ce  main -> main

➜  conflits git:(main)