Conversation OperationService::UserFFMergeBranch
**Stages**:
- [x] ~"Client Preparation": https://gitlab.com/gitlab-org/gitaly/issues/683
- [x] ~"RPC Design": https://gitlab.com/gitlab-org/gitaly/issues/691
- [x] ~"Server Implementation": https://gitlab.com/gitlab-org/gitaly/issues/692
- [x] ~"Client Implementation": https://gitlab.com/gitlab-org/gitaly/issues/693
- [x] ~"Acceptance Testing": https://gitlab.com/gitlab-org/gitaly/issues/710
**RPC Endpoints**:
- `OperationService::UserFFMergeBranch`
**Known Client Routes**:
- Set merge method to 'fast forward' in project settings, then merge merge request
------------------------------------------------------------
This code first needs to be moved into gitlab-git (i.e. client preparation). It does not rely on inter-Gitaly requests because we always merge from a local ref: there is no 'start_repository'. So this is not blocked by #665 (closed).
I expect the flow will be very similar to UserMergeBranch.
Edited by Kim Carlbäcker