Skip to content

Get Merge Conflicts

codecommit_get_merge_conflicts R Documentation

Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository

Description

Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.

Usage

codecommit_get_merge_conflicts(repositoryName,
  destinationCommitSpecifier, sourceCommitSpecifier, mergeOption,
  conflictDetailLevel, maxConflictFiles, conflictResolutionStrategy,
  nextToken)

Arguments

repositoryName

[required] The name of the repository where the pull request was created.

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.

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.

maxConflictFiles

The maximum number of files to include in the output.

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(
  mergeable = TRUE|FALSE,
  destinationCommitId = "string",
  sourceCommitId = "string",
  baseCommitId = "string",
  conflictMetadataList = list(
    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"
      )
    )
  ),
  nextToken = "string"
)

Request syntax

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