Paste Search Dynamic
Recent pastes
git pull origin main
  1. conflits git:(main) git pull origin main
  2. remote: Enumerating objects: 5, done.
  3. remote: Counting objects: 100% (5/5), done.
  4. remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
  5. Unpacking objects: 100% (3/3), done.
  6. From https://github.com/FabienBataille/conflits
  7.  * branch            main       -> FETCH_HEAD
  8.    3b4a968..57f7ae1  main       -> origin/main
  9. Auto-merging README.md
  10. CONFLICT (content): Merge conflict in README.md
  11. Automatic merge failed; fix conflicts and then commit the result.
  12. ➜  conflits git:(main) ✗ git commit -m "changement"
  13. U       README.md
  14. error: Committing is not possible because you have unmerged files.
  15. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  16. hint: as appropriate to mark resolution and make a commit.
  17. fatal: Exiting because of an unresolved conflict.
  18. ➜  conflits git:(main) ✗ git add README.md
  19. ➜  conflits git:(main) ✗ git status
  20. On branch main
  21. Your branch and 'origin/main' have diverged,
  22. and have 1 and 1 different commits each, respectively.
  23.   (use "git pull" to merge the remote branch into yours)
  24.  
  25. All conflicts fixed but you are still merging.
  26.   (use "git commit" to conclude merge)
  27.  
  28. Changes to be committed:
  29.         modified:   README.md
  30.  
  31. ➜  conflits git:(main) ✗ git commit -m "changement"
  32. [main 6f3e0ce] changement
  33. ➜  conflits git:(main) git push origin main
  34. Enumerating objects: 10, done.
  35. Counting objects: 100% (10/10), done.
  36. Delta compression using up to 4 threads
  37. Compressing objects: 100% (3/3), done.
  38. Writing objects: 100% (6/6), 635 bytes | 635.00 KiB/s, done.
  39. Total 6 (delta 0), reused 0 (delta 0)
  40. To https://github.com/FabienBataille/conflits.git
  41.    57f7ae1..6f3e0ce  main -> main
  42. ➜  conflits git:(main)
  43.  
Parsed in 0.004 seconds