ConflictFile
One conflicted file.
Shape
- kindConflictKindcontentadd_addmodify_deletedelete_modifybinarymoderenamefile_directorysubmoduleotherWhat kind of conflict a file has. Closed: a client offers different choices for each.
- pathstring
- resolvablebooleanWhether this file can be resolved in the browser.
- sectionsarray of ConflictSectionThe file as runs and blocks, for a
contentoradd_addconflict the browser can resolve. Empty for every other kind, which is resolved by a choice of the whole file. - old_pathstring or nulloptionalWhere the file was before a rename, when a rename is part of the conflict.
- refusalstring or nulloptionalWhy not, when it cannot.
- source_modeFileMode100644100755120000160000or nulloptionalThe file's mode on the merge request's branch; absent where that side has no file.
- target_modeFileMode100644100755120000160000or nulloptionalThe file's mode on the target branch; absent where that side has no file.
Example
Synthesized example{
"kind": "content",
"path": "path-04f5",
"resolvable": false,
"sections": [
{
"lines": [],
"type": "common"
}
],
"old_path": "old-path-65ea",
"refusal": "refusal-4d22",
"source_mode": "100644",
"target_mode": "100644"
}
Graph
Used inside
Contains
Used by
Sent by 0 operations
No operation takes it as a request body.
Returned by 0 operations
No operation returns it directly.