Sign in

v1

latestOpenAPI 3.0.0Apache 2.0 License2026-07-1477523442.5 KB

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.

post/#X-Amz-Target=CodeCommit_20150413.DescribeMergeConflicts

Query parameters

maxMergeHunksstring

Pagination limit

nextTokenstring

Pagination token

Headers

X-Amz-Target'CodeCommit_20150413.DescribeMergeConflicts' required

Request body

repositoryNamestring required

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

destinationCommitSpecifierstring 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).

sourceCommitSpecifierstring 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'FAST_FORWARD_MERGE' | 'SQUASH_MERGE' | 'THREE_WAY_MERGE' required

The merge option or strategy you want to use to merge the code.

maxMergeHunksinteger

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

filePathstring required

The path of the target files used to describe the conflicts.

conflictDetailLevel'FILE_LEVEL' | 'LINE_LEVEL'

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'NONE' | 'ACCEPT_SOURCE' | 'ACCEPT_DESTINATION' | 'AUTOMERGE'

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.

nextTokenstring

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

Response

Success

nextTokenstring

An enumeration token that can be used in a request to return the next batch of the results.

destinationCommitIdstring required

The commit ID of the destination commit specifier that was used in the merge evaluation.

sourceCommitIdstring required

The commit ID of the source commit specifier that was used in the merge evaluation.

baseCommitIdstring

The commit ID of the merge base.