▲ | sandstrom 3 days ago | |
Does anyone working at Github know why 'semi-linear' merge isn't supported as a merge strategy in the merge queue (and regular PRs)? I Gitlab and Azure DevOps (also owned by MS) supports it, and even talked to an employee now working at Github, that implemented this in Azure DevOps. More background: https://github.com/orgs/community/discussions/14863 With a semi-linear merge strategy, you rebase (without --fast-forward) before merging, so the history ends up looking like this:
It makes it easy to look at the Git history both at the 'PR level' kind of like a change log (`git log --merges --decorate --oneline`) or dig down into each PR to see all commits. | ||
▲ | jd__ 3 days ago | parent [-] | |
FWIW, Mergify's Merge Queue supports this as long as you run it without batching or parallel checks. We expose a config option for semi-linear history while still keeping CI green. |