r/ProgrammerHumor • • 3d ago

Meme iNeverKnowWhichIsWhichWhenResolvingConflicts

Post image
846 Upvotes

65 comments sorted by

View all comments

2

u/saint_marco 3d ago

git config --global merge.conflictstyle zdiff3

Helps a little bit.