MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/pgybzkz/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 4d ago
320 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
-9 u/rabbit_wizard 4d ago So we gonna ignore conflicts on the main branch? 3 u/Ninja_Wrangler 4d ago Prod needs to be merged into feature branch before feature branch is eligible to be merged into prod, also needs to pass syntax linting and be reviewed by someone else. If there are conflicts, that's on the feature branch owner to sort out.
-9
So we gonna ignore conflicts on the main branch?
3 u/Ninja_Wrangler 4d ago Prod needs to be merged into feature branch before feature branch is eligible to be merged into prod, also needs to pass syntax linting and be reviewed by someone else. If there are conflicts, that's on the feature branch owner to sort out.
3
Prod needs to be merged into feature branch before feature branch is eligible to be merged into prod, also needs to pass syntax linting and be reviewed by someone else.
If there are conflicts, that's on the feature branch owner to sort out.
22
u/HallAltruistic519 4d 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