Conflict resolution refactor
What does this MR do?
Refactor conflict resolution to contain git ops within Gitlab::Git.
Are there points in the code the reviewer needs to double check?
Yes, the refactors pointed out by REFACTOR NOTE comments.
Why was this MR needed?
This prepares the codebase for a Gitaly migration.
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
What are the relevant issue numbers?
Edited by Alejandro Rodríguez