Squash and merge with single RPC
Problem to solve
When fast forward merge strategy is enabled and a squash merge occurs, this is performed in two steps. It would be more reliable to do this in one step.
Further details
Proposal
Use git merge --squash
in this situation
Links / references
https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---squash