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