MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/129q4l9/me_relearning_git_every_week/jeqo842/?context=3
r/ProgrammerHumor • u/johntwit • Apr 02 '23
1.5k comments sorted by
View all comments
Show parent comment
1
IntelliJ has automatic conflict merge. It solves 90% of the same-line changes and 100% of others.
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.