batch_describe_merge_conflicts
¶
batch_describe_merge_conflicts(
repository_name: RepositoryName,
destination_commit_specifier: CommitName,
source_commit_specifier: CommitName,
merge_option: MergeOptionTypeEnum,
*,
config_overrides: Optional[CodeCommitClientConfig] = None,
max_merge_hunks: Optional[MaxResults] = None,
max_conflict_files: Optional[MaxResults] = None,
file_paths: Optional[FilePaths] = None,
conflict_detail_level: Optional[ConflictDetailLevelTypeEnum] = None,
conflict_resolution_strategy: Optional[ConflictResolutionStrategyTypeEnum] = None,
next_token: Optional[NextToken] = None,
) -> BatchDescribeMergeConflictsOutput
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.
Parameters:
-
repository_name(RepositoryName) –The name of the repository that contains the merge conflicts you want to review.
-
destination_commit_specifier(CommitName) –The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
-
source_commit_specifier(CommitName) –The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
-
merge_option(MergeOptionTypeEnum) –The merge option or strategy you want to use to merge the code.
-
max_merge_hunks(Optional[MaxResults], default:None) –The maximum number of merge hunks to include in the output.
-
max_conflict_files(Optional[MaxResults], default:None) –The maximum number of files to include in the output.
-
file_paths(Optional[FilePaths], default:None) –The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.
-
conflict_detail_level(Optional[ConflictDetailLevelTypeEnum], default:None) –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.
-
conflict_resolution_strategy(Optional[ConflictResolutionStrategyTypeEnum], default:None) –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.
-
next_token(Optional[NextToken], default:None) –An enumeration token that, when provided in a request, returns the next batch of the results.
Raises:
-
CommitDoesNotExistException–The specified commit does not exist or no commit was specified, and the specified repository has no default branch.
-
CommitRequiredException–A commit was not specified.
-
EncryptionIntegrityChecksFailedException–An encryption integrity check failed.
-
EncryptionKeyAccessDeniedException–An encryption key could not be accessed.
-
EncryptionKeyDisabledException–The encryption key is disabled.
-
EncryptionKeyNotFoundException–No encryption key was found.
-
EncryptionKeyUnavailableException–The encryption key is not available.
-
InvalidCommitException–The specified commit is not valid.
-
InvalidConflictDetailLevelException–The specified conflict detail level is not valid.
-
InvalidConflictResolutionStrategyException–The specified conflict resolution strategy is not valid.
-
InvalidContinuationTokenException–The specified continuation token is not valid.
-
InvalidMaxConflictFilesException–The specified value for the number of conflict files to return is not valid.
-
InvalidMaxMergeHunksException–The specified value for the number of merge hunks to return is not valid.
-
InvalidMergeOptionException–The specified merge option is not valid for this operation. Not all merge strategies are supported for all operations.
-
InvalidRepositoryNameException–A specified repository name is not valid.
This exception occurs only when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist.
-
MaximumFileContentToLoadExceededException–The number of files to load exceeds the allowed limit.
-
MaximumItemsToCompareExceededException–The number of items to compare between the source or destination branches and the merge base has exceeded the maximum allowed.
-
MergeOptionRequiredException–A merge option or stategy is required, and none was provided.
-
RepositoryDoesNotExistException–The specified repository does not exist.
-
RepositoryNameRequiredException–A repository name is required, but was not specified.
-
TipsDivergenceExceededException–The divergence between the tips of the provided commit specifiers is too great to determine whether there might be any merge conflicts. Locally compare the specifiers using
git diffor a diff tool. -
UnknownServiceError–The service returned an error code this client does not model.
Source code in docs_src/capo_codecommit/_services/code_commit.py
469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 | |