MergeConflicts

Shape

• filesarray of ConflictFile

  • The ConflictFile schema
  • 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 content or add_add conflict 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.
• resolvablebooleanWhether every conflict can be resolved in the browser. When false, refusal says why.
• source_branchBranchName (string)
• source_shaCommitHash (string)
• target_branchBranchName (string)
• target_shaCommitHash (string)
• merge_base_shaCommitHash (string) or nulloptionalWhere the two branches diverged; absent when they share no history.
• refusalRefusal or nulloptional

  • The Refusal schema
  • codeRefusalCodePERMISSION_REQUIREDBRANCH_PROTECTEDAGENT_REFFOREIGN_AUTHORPRIVILEGED_PATHBRANCH_NOT_FOUNDSTART_BRANCH_NOT_FOUNDFILE_NOT_FOUNDREPOSITORY_EMPTYMR_NOT_OPENNOT_CONFLICTEDHEAD_MOVEDBRANCH_EXISTSFILE_CHANGEDFILE_EXISTSPATH_CONFLICTUNSUPPORTED_ENTRYNOTHING_TO_COMMITUNRESOLVEDNOT_IN_CONFLICTUNSUPPORTED_CONFLICTPUSH_RULE_VIOLATIONWhat kind of refusal this is. Closed: a client branches on it. The wire spelling is the SCREAMING_SNAKE domain code that leads an error's message, so a refusal returned as data and the same refusal returned as an error read the same.
  • messagestringWhat is wrong, in a sentence a person can act on.
  • fieldstring or nulloptionalThe part of the request the refusal is about: message, branch, or actions[i] for the i-th file change.
  • rulestring or nulloptionalThe push rule that refused, by its setting's name (require_issue_reference), when code is PUSH_RULE_VIOLATION.

Graph

Used by