4 ms·

Merging merge requests as merge commits (rather than fast-forwarding them) gives the same granularity in the main branch, while preserving the option to have bi

by _flux 9mo ago

Merging merge requests as merge commits (rather than fast-forwarding them) gives the same granularity in the main branch, while preserving the option to have bisect dive inside the original MR to actually find the change that made the interesting change in behavior.

yxhuvud 9mo ago
I wish github created automation for this flow like they have for other variants.
- kunley 9mo ago
  But they have, with pull requests. When you merge a pull request it is done via the "subtree" merge strategt, which preserves partial commits and also does not flatten them.
  - yxhuvud 9mo ago
    There is no button to rebase, and then merge with a merge commit no-ff.