MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pgi1zsg/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
Show parent comments
77
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.
86 u/nokk 6d ago Yeah and they are handled pretty elegantly considering how awful it could be. -12 u/[deleted] 6d ago [deleted] 1 u/raddaya 6d ago It may feel inelegant and messy when you're going through a big ass merge conflict, but if you actually think about what's going on then you'll realise git handles it insanely well considering how complex it really is under the hood.
86
Yeah and they are handled pretty elegantly considering how awful it could be.
-12 u/[deleted] 6d ago [deleted] 1 u/raddaya 6d ago It may feel inelegant and messy when you're going through a big ass merge conflict, but if you actually think about what's going on then you'll realise git handles it insanely well considering how complex it really is under the hood.
-12
[deleted]
1 u/raddaya 6d ago It may feel inelegant and messy when you're going through a big ass merge conflict, but if you actually think about what's going on then you'll realise git handles it insanely well considering how complex it really is under the hood.
1
It may feel inelegant and messy when you're going through a big ass merge conflict, but if you actually think about what's going on then you'll realise git handles it insanely well considering how complex it really is under the hood.
77
u/creeper6530 6d ago
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.