Gitaly conflict resolver

What does this MR do?

Implement Gitaly RPCs ListConflictFiles and ResolveConficts

Are there points in the code the reviewer needs to double check?

No

Why was this MR needed?

gitaly#551 (closed)

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests added for this feature/bug
• Review
  • Has been reviewed by UX
  • Has been reviewed by Frontend
  • Has been reviewed by Backend
  • Has been reviewed by Database
• Conform by the merge request performance guides
• Conform by the style guides
• Squashed related commits together
• Internationalization required/considered

What are the relevant issue numbers?

Closes gitaly#813 (closed)