Conditionally call UserMergeBranch RPC with squash
In order to facilitate a new "squash and merge" merge strategy we should:
- Update the UserMergeBranch RPC with a squash field: gitaly#6131 (moved)
- Add a new merge strategy using the squash field
Edited by Jerry Seto