The conflicts resolution UI shows the list of conflicts that one can resolve by editing the conflicting files in the browser.
I probably missed something but I haven’t seen a way to do the following in the GitLab API documentation :
- get the conflict list from the GitLab API (the web browser seems to send a GET to project/:id/merge_request/:id/conflicts)
- resolve the conflicts (it seems to be a POST on project/:id/merge_request/:id/resolve_conflicts )
Any idea ?