View source: R/codecommit_operations.R
codecommit_describe_merge_conflicts | R Documentation |
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.
See https://www.paws-r-sdk.com/docs/codecommit_describe_merge_conflicts/ for full documentation.
codecommit_describe_merge_conflicts(
repositoryName,
destinationCommitSpecifier,
sourceCommitSpecifier,
mergeOption,
maxMergeHunks = NULL,
filePath,
conflictDetailLevel = NULL,
conflictResolutionStrategy = NULL,
nextToken = NULL
)
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. |
Add the following code to your website.
For more information on customizing the embed code, read Embedding Snippets.