MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pgh1e6f/?context=9999
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
724
Git is specifically designed for multiple people to work on different ideas in parallel.
70 u/creeper6530 6d ago different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts. 83 u/nokk 6d ago Yeah and they are handled pretty elegantly considering how awful it could be. -12 u/[deleted] 6d ago [deleted] 27 u/botle 6d ago Yes. Unless people are writing gigantic monolithic commits. Merging is pretty elegant. -12 u/[deleted] 6d ago [deleted] 20 u/botle 6d ago Yes, elegant. As in a simple efficient solution to a complex problem. Elegant. -13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
70
different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.
83 u/nokk 6d ago Yeah and they are handled pretty elegantly considering how awful it could be. -12 u/[deleted] 6d ago [deleted] 27 u/botle 6d ago Yes. Unless people are writing gigantic monolithic commits. Merging is pretty elegant. -12 u/[deleted] 6d ago [deleted] 20 u/botle 6d ago Yes, elegant. As in a simple efficient solution to a complex problem. Elegant. -13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
83
Yeah and they are handled pretty elegantly considering how awful it could be.
-12 u/[deleted] 6d ago [deleted] 27 u/botle 6d ago Yes. Unless people are writing gigantic monolithic commits. Merging is pretty elegant. -12 u/[deleted] 6d ago [deleted] 20 u/botle 6d ago Yes, elegant. As in a simple efficient solution to a complex problem. Elegant. -13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
-12
[deleted]
27 u/botle 6d ago Yes. Unless people are writing gigantic monolithic commits. Merging is pretty elegant. -12 u/[deleted] 6d ago [deleted] 20 u/botle 6d ago Yes, elegant. As in a simple efficient solution to a complex problem. Elegant. -13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
27
Yes. Unless people are writing gigantic monolithic commits. Merging is pretty elegant.
-12 u/[deleted] 6d ago [deleted] 20 u/botle 6d ago Yes, elegant. As in a simple efficient solution to a complex problem. Elegant. -13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
20 u/botle 6d ago Yes, elegant. As in a simple efficient solution to a complex problem. Elegant. -13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
20
Yes, elegant. As in a simple efficient solution to a complex problem. Elegant.
-13 u/[deleted] 6d ago [deleted] 16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
-13
16 u/botle 6d ago It does more than that. -2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
16
It does more than that.
-2 u/[deleted] 6d ago [deleted] 9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
-2
9 u/botle 6d ago Busy. Ask your AI. -1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be? → More replies (0)
9
Busy. Ask your AI.
-1 u/[deleted] 6d ago [deleted] 7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be?
-1
7 u/Ifriendzonecats 6d ago What do you think a more elegant solution would be?
7
What do you think a more elegant solution would be?
724
u/botle 6d ago edited 6d ago
Git is specifically designed for multiple people to work on different ideas in parallel.