3 ms·
> Merge squash works every time. Unless you've already started a follow-up branch before the first gets merged (eg. Waiting for QA, PO review etc.) Then you a
by turtles3 3y ago
> Merge squash works every time.
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.
- mixmastamyk 3y agoNever did that exactly. Think I've either, started a new branch from the waiting one or, started a new branch from the main and then pulled from the older feature branch. Have no recollection of any problems, but it is rare enough to not have tried it recently.