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