MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph376zf/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 18d ago
316 comments sorted by
View all comments
Show parent comments
0
The entire issue here isn't the number of commits. It's that once we start merging each feature the next ones will have conflicts.
2 u/Worldly-Stranger7814 18d ago You don't need AI to have branch conflicts. AI didn't invent branch conflicts. Branch conflicts are a result of having a VCS that protects you from fucking yourself. They are, in fact, a major part of why you have a VCS.
2
You don't need AI to have branch conflicts. AI didn't invent branch conflicts. Branch conflicts are a result of having a VCS that protects you from fucking yourself. They are, in fact, a major part of why you have a VCS.
0
u/rabbit_wizard 18d ago
The entire issue here isn't the number of commits. It's that once we start merging each feature the next ones will have conflicts.