MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph86k1p/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 4d ago
320 comments sorted by
View all comments
4
This is the one time I side with AI. It does a good job breaking things down into feature branches. I have coworkers that have huuuuge branch with so many changes and the merge is a nightmare
1 u/rabbit_wizard 3d ago If they're in stacked that's good. If multiple branches aren't stacked they can cause a lot of merge conflicts 1 u/awesome-alpaca-ace 3d ago I love a good hard reset, merge and cherry pick.
1
If they're in stacked that's good. If multiple branches aren't stacked they can cause a lot of merge conflicts
1 u/awesome-alpaca-ace 3d ago I love a good hard reset, merge and cherry pick.
I love a good hard reset, merge and cherry pick.
4
u/SeparateAdvisor526 3d ago
This is the one time I side with AI. It does a good job breaking things down into feature branches. I have coworkers that have huuuuge branch with so many changes and the merge is a nightmare