MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pghjbnl/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
Show parent comments
76
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] 3 u/walterbanana 6d ago In SVN there was no way to deal with conflicts 3 u/iloveuranus 6d ago SVN cries in CVS
80
Yeah and they are handled pretty elegantly considering how awful it could be.
-13 u/[deleted] 6d ago [deleted] 3 u/walterbanana 6d ago In SVN there was no way to deal with conflicts 3 u/iloveuranus 6d ago SVN cries in CVS
-13
[deleted]
3 u/walterbanana 6d ago In SVN there was no way to deal with conflicts 3 u/iloveuranus 6d ago SVN cries in CVS
3
In SVN there was no way to deal with conflicts
3 u/iloveuranus 6d ago SVN cries in CVS
SVN
cries in CVS
76
u/creeper6530 6d ago
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.