Open
Description
I know this was mentioned somewhere on Zulip, but figured it's worth an issue to discuss.
It seems like using an octopus merge when handling >1 PR may be better than the current strategy of doing individual rollup commits. Some reasons:
- It enforces the desired strategy for rollup merges, i.e. it will not allow a "complex merge that needs manual resolution". We already have to be sure that rollups contain only orthogonal branches, I have a mild suspicion that letting git handle the resolution may make this easier to implement.
- Easier to understand history. It is currently kind of tricky to navigate around the git log and see (1) what was merged & tested together, and (2) what the source of the rollup is, since the rollup PR is not linked. Using a single merge commit to represent the rollup PR/test makes this easier to understand
- More concise git history. This is obviously a low priority thing, but not having a separate merge commit for every PR helps keep history smaller and much less noisy
Metadata
Metadata
Assignees
Labels
No labels