Paste Search Dynamic
Recent pastes
git merge-conflits
  1. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main)
  2. $ git pull
  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), 707 bytes | 28.00 KiB/s, done.
  8. From https://github.com/EmelineLeduc/merge-conflits
  9.    99d9f76..43351eb  main       -> origin/main
  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. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main|MERGING)
  15. $ code .
  16.  
  17. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main|MERGING)
  18. $ git status
  19. On branch main
  20. Your branch and 'origin/main' have diverged,
  21. and have 1 and 1 different commits each, respectively.
  22.   (use "git pull" to merge the remote branch into yours)
  23.  
  24. You have unmerged paths.
  25.   (fix conflicts and run "git commit")
  26.   (use "git merge --abort" to abort the merge)
  27.  
  28. Unmerged paths:
  29.   (use "git add <file>..." to mark resolution)
  30.         both modified:   README.md
  31.  
  32. no changes added to commit (use "git add" and/or "git commit -a")
  33.  
  34. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main|MERGING)
  35. $ git add .
  36.  
  37. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main|MERGING)
  38. $ git status
  39. On branch main
  40. Your branch and 'origin/main' have diverged,
  41. and have 1 and 1 different commits each, respectively.
  42.   (use "git pull" to merge the remote branch into yours)
  43.  
  44. All conflicts fixed but you are still merging.
  45.   (use "git commit" to conclude merge)
  46.  
  47.  
  48. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main|MERGING)
  49. $ git commit -m "select word local"
  50. [main 869d9bb] select word local
  51.  
  52. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main)
  53. $ git status
  54. On branch main
  55. Your branch is ahead of 'origin/main' by 2 commits.
  56.   (use "git push" to publish your local commits)
  57.  
  58. nothing to commit, working tree clean
  59.  
  60. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main)
  61. $ git pull
  62. Already up to date.
  63.  
  64. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main)
  65. $ git push origin main
  66. Enumerating objects: 8, done.
  67. Counting objects: 100% (8/8), done.
  68. Delta compression using up to 12 threads
  69. Compressing objects: 100% (3/3), done.
  70. Writing objects: 100% (4/4), 444 bytes | 444.00 KiB/s, done.
  71. Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
  72. remote: Resolving deltas: 100% (1/1), done.
  73. To https://github.com/EmelineLeduc/merge-conflits.git
  74.    43351eb..869d9bb  main -> main
  75.  
  76. 33682@DESKTOP-IRJLV1N MINGW64 ~/Emeline/WCS/challenges/git/merge-conflits (main)
  77. $
Parsed in 0.007 seconds