PRs are fast-forward merged onto the mainline rather than branch-and-merge

PRs should be developed on their own branches, and the branch merged to the mainline.  Currently the mainline is linear; the PR is fast forwarded onto the mainline rather than being branched and the branch then merged.
