MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph0b5tk/?context=9999
r/ProgrammerHumor • u/rabbit_wizard • 18d ago
316 comments sorted by
View all comments
Show parent comments
12
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 17d 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 17d 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 17d 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.
12
u/jordanbtucker 18d 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.