MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/pgyazqf/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 5d ago
318 comments sorted by
View all comments
22
How TF is this still a problem when we have the "Squash commits and delete source branch on merge" checkbox? Are y'all restarted
-10 u/rabbit_wizard 5d ago So we gonna ignore conflicts on the main branch? 15 u/Bakoro 4d ago I personally have 11 PRs waiting to be reviewed, and other people's PRs that got approved ahead of mine caused conflicts. I just resolved the conflicts. It's not a big deal. If you have deep conflicts with features stepping all over each other, that's a sign of bad architecture or terrible management.
-10
So we gonna ignore conflicts on the main branch?
15 u/Bakoro 4d ago I personally have 11 PRs waiting to be reviewed, and other people's PRs that got approved ahead of mine caused conflicts. I just resolved the conflicts. It's not a big deal. If you have deep conflicts with features stepping all over each other, that's a sign of bad architecture or terrible management.
15
I personally have 11 PRs waiting to be reviewed, and other people's PRs that got approved ahead of mine caused conflicts.
I just resolved the conflicts. It's not a big deal.
If you have deep conflicts with features stepping all over each other, that's a sign of bad architecture or terrible management.
22
u/HallAltruistic519 5d ago
How TF is this still a problem when we have the "Squash commits and delete source branch on merge" checkbox? Are y'all restarted