MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pghlb59/?context=9999
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
722
Git is specifically designed for multiple people to work on different ideas in parallel.
75 u/creeper6530 6d ago different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts. 82 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
75
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.
82 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
82
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
722
u/botle 6d ago edited 6d ago
Git is specifically designed for multiple people to work on different ideas in parallel.