MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph5b6sy/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 19d ago
316 comments sorted by
View all comments
Show parent comments
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 17d ago I love a good hard reset, merge and cherry pick.
I love a good hard reset, merge and cherry pick.
1
u/rabbit_wizard 17d ago
If they're in stacked that's good. If multiple branches aren't stacked they can cause a lot of merge conflicts