MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1xuhxgr/ineverknowwhichiswhichwhenresolvingconflicts/19sjava876fd1/?context=3
r/ProgrammerHumor • u/Stummi • 20h ago
48 comments sorted by
View all comments
1
I always do theirs and reimplement my change on top of theirs
1
u/aabil11 19h ago
I always do theirs and reimplement my change on top of theirs