3 ms·
> Why is this impossible to do with a commit-merge workflow? Some change in the main branch (after your feature branch diverged) could break the new feature, w
by geysersam 4y ago
> Why is this impossible to do with a commit-merge workflow?
Some change in the main branch (after your feature branch diverged) could break the new feature, without causing a merge conflict.
- counttheforks 4y agoYou could use `--no-ff` to force a merge commit and then amend it. Not very common, though.
- MereInterest 4y agoThis can happen for either a rebase or a merge, though. In the case of a rebase, you’re left with commit(s) on top of main, which are entirely broken. In the case of a rebase, you have a working dev branch, a working main branch up to the merge, and a merge commit with broken code. The merge results in a much better state, because you have a working version to compare against. In addition, the history makes it clear that the merge caused the breakage, and that it wasn’t solely an issue with the new feature.