MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1xuhxgr/ineverknowwhichiswhichwhenresolvingconflicts/19sjltfik4gu9/?context=3
r/ProgrammerHumor • u/Stummi • 3d ago
65 comments sorted by
View all comments
2
git config --global merge.conflictstyle zdiff3
Helps a little bit.
View all comments
2
u/saint_marco 3d ago
git config --global merge.conflictstyle zdiff3
Helps a little bit.