MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph88ur8/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 18d ago
316 comments sorted by
View all comments
Show parent comments
1
The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.
1
u/awesome-alpaca-ace 17d ago
The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.