Conversation: Merge Request: Conflict Resolver

---

Stages:

• ~"Client Preparation": #553 (closed) https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14747 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15897

• RPC Design: #664 (closed) gitaly-proto!129 (merged)

• Server Implementation: #788 (closed)

• ~"Client Implementation": #813 (closed)

• ~"Acceptance Testing": #911 (closed)

Blocked On:

• #665 (closed)

RPC Endpoints:

• Endpoint::Name

Known Client Routes:

• Known client endpoints

---