ResolveConflictsRequest
Resolve a merge request's conflicts with one merge commit on its branch.
Shape
filesarray of ConflictResolutionOne resolution per conflicted file, and none for a file that is not.
- The ConflictResolution schema
- actionResolutionActionwriteuse_sourceuse_targetdeleteHow one conflicted file is resolved.
- pathFilePath (string)
- contentstring or nulloptionalThe file's resolved content, for
write. - encodingBlobEncodingutf8base64optional
- source_shaCommitHash (string)The merge request's branch head the resolution was made against.
- target_shaCommitHash (string)The target branch head the resolution was made against.
- messageCommitMessage (string) or nulloptionalThe merge commit's message. Defaults to
Merge branch '<target>' into '<source>'.
Example
Synthesized example{
"files": [
{
"action": "write",
"path": "path-0837"
}
],
"source_sha": "33194911bc037452a2edf8c8d13109aeaf1c9946",
"target_sha": "f1c68fa24984f30c06af0912885acad6f738a2fa",
"message": "Pin a page's payload to the build that rendered it"
}
Graph
Used inside
No schema contains this one.
Contains
Used by
Sent by 1 operation
Returned by 0 operations
No operation returns it directly.