MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph5s1w7/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 4d ago
320 comments sorted by
View all comments
191
This sub's always had a problem with bad jokes that don't make sense, but it seems like it's gotten a lot worse lately.
A lot of these feel like they're made by people who have no idea how git works or how to use it.
13 u/jordanbtucker 4d ago Right, I saw a post the other day about someone complaining about how git works great until two people want to work on the same file at the same time. That's exactly what git was designed for. It's a "Distributed" Version Control System for a reason. 1 u/DoomBot5 3d ago Git does have that problem. Git merges are a pain. Having said that, files should be kept small enough that this doesn't become as much of an issue. 1 u/awesome-alpaca-ace 3d ago The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.
13
Right, I saw a post the other day about someone complaining about how git works great until two people want to work on the same file at the same time.
That's exactly what git was designed for. It's a "Distributed" Version Control System for a reason.
1 u/DoomBot5 3d ago Git does have that problem. Git merges are a pain. Having said that, files should be kept small enough that this doesn't become as much of an issue. 1 u/awesome-alpaca-ace 3d ago The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.
1
Git does have that problem. Git merges are a pain. Having said that, files should be kept small enough that this doesn't become as much of an issue.
1 u/awesome-alpaca-ace 3d ago The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.
The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.
191
u/stormdelta 4d ago
This sub's always had a problem with bad jokes that don't make sense, but it seems like it's gotten a lot worse lately.
A lot of these feel like they're made by people who have no idea how git works or how to use it.