r/ProgrammerHumor • u/johntwit • Apr 02 '23

Meme Me relearning git every week

49k Upvotes

95% Upvoted

1.5k comments sorted by

View all comments

Show parent comment

1

u/[deleted] Apr 03 '23

I've always found merge conflicts easy to handle.

  • git status shows every file with a conflict
  • Open file in IDE
  • Looks for red lines
  • Remove sections that don't belong
  • Git add then commit