Paste Search Dynamic
confo@LAPTOP-M8H71O6N MINGW64
  1. confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)
  2. $ git pull https://github.com/INGRIDPRUVOST/challenge
  3. remote: Enumerating objects: 5, done.
  4. remote: Counting objects: 100% (5/5), done.
  5. remote: Compressing objects: 100% (2/2), done.
  6. remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
  7. Unpacking objects: 100% (3/3), 742 bytes | 32.00 KiB/s, done.
  8. From https://github.com/INGRIDPRUVOST/challenge
  9.  * branch            HEAD       -> FETCH_HEAD
  10. Auto-merging README.md
  11. CONFLICT (content): Merge conflict in README.md
  12. Automatic merge failed; fix conflicts and then commit the result.
  13.  
  14. confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main|MERGING)
  15. $ git add README.md
  16.  
  17. confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main|MERGING)
  18. $ git commit -m "résolution du conflit"
  19. [main bae96b6] résolution du conflit
  20.  
  21. confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)
  22. $ git pull https://github.com/INGRIDPRUVOST/challenge
  23. From https://github.com/INGRIDPRUVOST/challenge
  24.  * branch            HEAD       -> FETCH_HEAD
  25. Already up to date.
  26.  
  27. confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)
  28. $ git push https://github.com/INGRIDPRUVOST/challenge main
  29. Enumerating objects: 8, done.
  30. Counting objects: 100% (8/8), done.
  31. Delta compression using up to 8 threads
  32. Compressing objects: 100% (3/3), done.
  33. Writing objects: 100% (4/4), 479 bytes | 239.00 KiB/s, done.
  34. Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
  35. remote: Resolving deltas: 100% (1/1), done.
  36. To https://github.com/INGRIDPRUVOST/challenge
  37.    0f60371..bae96b6  main -> main
  38.  
  39. confo@LAPTOP-M8H71O6N MINGW64 ~/challenge (main)
  40. $
Parsed in 0.004 seconds