A bit overstated but yes. Merge squash works every time.
Rebase in my experience at work led to inexplicable conflicts several times I tried. When that happens the rebase preachers will be nowhere to be found, and you’re on your own.
Rebase in my experience at work led to inexplicable conflicts several times I tried. When that happens the rebase preachers will be nowhere to be found, and you’re on your own.
Unless you've already started a follow-up branch before the first gets merged (eg. Waiting for QA, PO review etc.)
Then you at minimum will need to rebase your second branch after the first is merged. Not a disaster but it adds overhead.
Which is a particular kind of rebase except the final commit gets cherry-picked to the target branch (instead of rewriting the original branch).