describe_merge_conflicts
async
¶
describe_merge_conflicts(
repository_name: RepositoryName,
destination_commit_specifier: CommitName,
source_commit_specifier: CommitName,
merge_option: MergeOptionTypeEnum,
file_path: Path,
*,
config_overrides: Optional[AsyncCodeCommitClientConfig] = None,
max_merge_hunks: Optional[MaxResults] = None,
conflict_detail_level: Optional[ConflictDetailLevelTypeEnum] = None,
conflict_resolution_strategy: Optional[ConflictResolutionStrategyTypeEnum] = None,
next_token: Optional[NextToken] = None,
) -> DescribeMergeConflictsOutput
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.
Parameters:
-
repository_name(RepositoryName) –The name of the repository where you want to get information about a merge conflict.
-
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.
-
file_path(Path) –The path of the target files used to describe the conflicts.
-
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.
-
FileDoesNotExistException–The specified file does not exist. Verify that you have used the correct file name, full path, and extension.
-
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.
-
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.
-
InvalidPathException–The specified path is not valid.
-
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.
-
PathRequiredException–The folderPath for a location cannot be null.
-
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/async_code_commit.py
1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 | |