ResolveConflictsResponse

Shape

• commitCommitThe merge commit on the merge request's branch.

  • The Commit schema
  • author_emailEmail (string)
  • author_namestring
  • authored_atstring
  • commit_shaCommitHash (string)
  • committed_atstring
  • committer_emailEmail (string)
  • committer_namestring
  • repository_idRepositoryId (string · uuid)
  • short_shaShortCommitHash (string)
  • titlestring
  • author_avatar_urlstring or nulloptional
  • committer_avatar_urlstring or nulloptional
  • messagestring or nulloptional
  • parent_shasarray of CommitHash (string)optional
  • tagsarray of TagName (string)optional
• merge_requestMergeRequestThe merge request, now proposing the merge commit.

  • The MergeRequest schema
  • created_atstring
  • created_byPrincipalId (string · uuid)The person or agent who opened it.
  • is_draftboolean
  • merge_request_idMergeRequestId (integer · int64)
  • repository_idRepositoryId (string · uuid)
  • source_branchBranchName (string)
  • source_branch_deletedboolean
  • source_branch_headCommitHash (string)
  • statusMergeRequestStatusopenmergedclosed
  • target_branchBranchName (string)
  • target_branch_headCommitHash (string)
  • titleMrTitle (string)
  • updated_atstring
  • author_can_pushboolean or nulloptionalWhether the author can push to the repository — false for a drive-by contributor's merge request. Absent where it was not computed.
  • closed_atstring or nulloptional
  • closed_byPrincipalId (string · uuid) or nulloptional
  • descriptionMrDescription (string) or nulloptional
  • merge_commit_shaCommitHash (string) or nulloptional
  • merged_atstring or nulloptional
  • merged_byPrincipalId (string · uuid) or nulloptional
  • restack_requiredbooleanoptionalPrecise restack signal — set when this MR's downstack was squash-merged (a rebase is genuinely required to drop the duplicated diff). Distinct from the advisory commits_behind. Reset on the MR's next source-advancing write.
  • stack_summaryStackSummary or nulloptionalThe neighbouring merge requests in this stack. Returned when fetching a single merge request, not in listings.

    • The StackSummary schema
    • has_downstackboolean
    • has_upstackboolean
    • downstack_mr_idMergeRequestId (integer · int64) or nulloptional
    • upstack_mr_idsarray of MergeRequestId (integer · int64)optional
  • versioninteger · int64optional0–∞Optimistic-concurrency counter. Bumped on every write; writes condition on the read value.

Graph

Used by