ConflictSummary
The merge gate's view of a merge request's conflicts — enough to offer the right action without reading every conflict.
Shape
- file_countinteger · int320–∞How many files conflict.
- resolvable_in_browserbooleanWhether they can all be resolved in the browser; when not, they are resolved with git.
- viewer_can_resolvebooleanWhether the caller may resolve them: resolving pushes a merge commit to the merge request's branch, so this is whether they may push there.
- resolve_refusalstring or nulloptionalWhy not, when they may not.
Example
Synthesized example{
"file_count": 6,
"resolvable_in_browser": false,
"viewer_can_resolve": false,
"resolve_refusal": "resolve-refusal-5309"
}
Graph
Used inside
Contains
No named schema inside.
Used by
Sent by 0 operations
No operation takes it as a request body.
Returned by 1 operation