sort of a rebase+merge commit

# random

[ursus]

sort of a rebase+merge commit

[wasyl]

You can use git merge --no-ff to always create a merge commit. That, combined with rebasing previously, will do what you want I think. But afaik you still need to rebase first, then merge with --no-ff option

[ursus]

but means I need to do that manually just before merging the PR right?

[wasyl]

That’s right, at least in Github