Gitlab has this very useful merging strategy for pull requests. This is an excerpt from their docs:
Semi-linear history merge requests
A merge commit is created for every merge, but the branch is only merged if a fast-forward merge is possible. This ensures that if the merge request build succeeded, the target branch build will also succeed after merging.
It would be trivial to implement: you could completely reuse your code for “rebase and then merge”, just add the
Can you consider this?