Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy¶

Description¶

Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.

Usage¶

codecommit_describe_merge_conflicts(repositoryName,
  destinationCommitSpecifier, sourceCommitSpecifier, mergeOption,
  maxMergeHunks, filePath, conflictDetailLevel,
  conflictResolutionStrategy, nextToken)

Arguments¶

repositoryName

[required] The name of the repository where you want to get information about a merge conflict.
destinationCommitSpecifier

[required] The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
sourceCommitSpecifier

[required] The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
mergeOption

[required] The merge option or strategy you want to use to merge the code.
maxMergeHunks

The maximum number of merge hunks to include in the output.
filePath

[required] The path of the target files used to describe the conflicts.
conflictDetailLevel

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
conflictResolutionStrategy

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
nextToken

An enumeration token that, when provided in a request, returns the next batch of the results.

Value¶

A list with the following syntax:

list(
  conflictMetadata = list(
    filePath = "string",
    fileSizes = list(
      source = 123,
      destination = 123,
      base = 123
    ),
    fileModes = list(
      source = "EXECUTABLE"|"NORMAL"|"SYMLINK",
      destination = "EXECUTABLE"|"NORMAL"|"SYMLINK",
      base = "EXECUTABLE"|"NORMAL"|"SYMLINK"
    ),
    objectTypes = list(
      source = "FILE"|"DIRECTORY"|"GIT_LINK"|"SYMBOLIC_LINK",
      destination = "FILE"|"DIRECTORY"|"GIT_LINK"|"SYMBOLIC_LINK",
      base = "FILE"|"DIRECTORY"|"GIT_LINK"|"SYMBOLIC_LINK"
    ),
    numberOfConflicts = 123,
    isBinaryFile = list(
      source = TRUE|FALSE,
      destination = TRUE|FALSE,
      base = TRUE|FALSE
    ),
    contentConflict = TRUE|FALSE,
    fileModeConflict = TRUE|FALSE,
    objectTypeConflict = TRUE|FALSE,
    mergeOperations = list(
      source = "A"|"M"|"D",
      destination = "A"|"M"|"D"
    )
  ),
  mergeHunks = list(
    list(
      isConflict = TRUE|FALSE,
      source = list(
        startLine = 123,
        endLine = 123,
        hunkContent = "string"
      ),
      destination = list(
        startLine = 123,
        endLine = 123,
        hunkContent = "string"
      ),
      base = list(
        startLine = 123,
        endLine = 123,
        hunkContent = "string"
      )
    )
  ),
  nextToken = "string",
  destinationCommitId = "string",
  sourceCommitId = "string",
  baseCommitId = "string"
)

Request syntax¶

svc$describe_merge_conflicts(
  repositoryName = "string",
  destinationCommitSpecifier = "string",
  sourceCommitSpecifier = "string",
  mergeOption = "FAST_FORWARD_MERGE"|"SQUASH_MERGE"|"THREE_WAY_MERGE",
  maxMergeHunks = 123,
  filePath = "string",
  conflictDetailLevel = "FILE_LEVEL"|"LINE_LEVEL",
  conflictResolutionStrategy = "NONE"|"ACCEPT_SOURCE"|"ACCEPT_DESTINATION"|"AUTOMERGE",
  nextToken = "string"
)