Comment by epage

What I wish github supported was "git rebase && git merge --no-ff", or as Azure DevOps calls it "semi-linear merge".

A fairly linear history is a lot easier to read but it is nice to preserve the branch by having a merge-commit.