Simplify conflict resolver interface
What does this MR do?
Simplify conflict resolver interface
This does two things:
- Pass commit oids instead of
Gitlab::Git::Commits. We only need the former. - Depend on only the target repository for conflict listing. For conflict resolution, treat one repository as a remote one so that we can implement it as such in Gitaly.
Are there points in the code the reviewer needs to double check?
No
Why was this MR needed?
Porting this feature to Gitaly in its current state is a hassle, because it requires rugged operations from two repositories but in a post Gitaly world those two repositories may not be mounted on the same shard, so the communication has to be between Gitaly instances. This is accomplished by only doing rugged operations on one repository and treating the other as a remote repository, which this accomplishes.
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?
Edited by Alejandro Rodríguez