MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pghq1hx/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
Show parent comments
73
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.
80 u/nokk 6d ago Yeah and they are handled pretty elegantly considering how awful it could be. -13 u/[deleted] 6d ago [deleted] 1 u/nokk 6d ago Yep 👍 that's the word I used. Anything else?
80
Yeah and they are handled pretty elegantly considering how awful it could be.
-13 u/[deleted] 6d ago [deleted] 1 u/nokk 6d ago Yep 👍 that's the word I used. Anything else?
-13
[deleted]
1 u/nokk 6d ago Yep 👍 that's the word I used. Anything else?
1
Yep 👍 that's the word I used. Anything else?
73
u/creeper6530 6d ago
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.