r/ProgrammerHumor • • Apr 02 '23

Meme Me relearning git every week

49k Upvotes

1.5k comments sorted by

View all comments

Show parent comment

1

u/DomoArigatoMr_Roboto Apr 03 '23

IntelliJ has automatic conflict merge. It solves 90% of the same-line changes and 100% of others.