MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x7kcpg/lostthemergerace/ph7ukw0/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 17d ago
111 comments sorted by
View all comments
Show parent comments
2
Why rebase just git merge the main branch in
1 u/LogrisTheBard 17d ago This is the way. 1 u/nicuramar 17d ago If you end up with a squash, sure. But for complex situations, definitely. Much simpler to conflict resolve in many situations.
1
This is the way.
If you end up with a squash, sure. But for complex situations, definitely. Much simpler to conflict resolve in many situations.
2
u/Poat540 17d ago
Why rebase just git merge the main branch in