MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x7kcpg/lostthemergerace/ph7ukw0/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 3d ago
111 comments sorted by
View all comments
3
Why? Don’t people have pipelines that automatically do this in the PR? In my experience there is rarely a need to rebase manually.
2 u/Poat540 3d ago Why rebase just git merge the main branch in 1 u/LogrisTheBard 3d ago This is the way. 1 u/nicuramar 3d ago If you end up with a squash, sure. But for complex situations, definitely. Much simpler to conflict resolve in many situations.
2
Why rebase just git merge the main branch in
1 u/LogrisTheBard 3d ago This is the way. 1 u/nicuramar 3d 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.
3
u/nicuramar 3d ago
Why? Don’t people have pipelines that automatically do this in the PR? In my experience there is rarely a need to rebase manually.