get_merge_conflicts
async
¶
get_merge_conflicts(
repository_name: RepositoryName,
destination_commit_specifier: CommitName,
source_commit_specifier: CommitName,
merge_option: MergeOptionTypeEnum,
*,
config_overrides: Optional[AsyncCodeCommitClientConfig] = None,
conflict_detail_level: Optional[ConflictDetailLevelTypeEnum] = None,
max_conflict_files: Optional[MaxResults] = None,
conflict_resolution_strategy: Optional[ConflictResolutionStrategyTypeEnum] = None,
next_token: Optional[NextToken] = None,
) -> GetMergeConflictsOutput
Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.
Parameters:
-
repository_name(RepositoryName) –The name of the repository where the pull request was created.
-
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.
-
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.
-
max_conflict_files(Optional[MaxResults], default:None) –The maximum number of files to include in the output.
-
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.
-
InvalidDestinationCommitSpecifierException–The destination commit specifier is not valid. You must provide a valid branch name, tag, or full commit ID.
-
InvalidMaxConflictFilesException–The specified value for the number of conflict files 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.
-
InvalidSourceCommitSpecifierException–The source commit specifier is not valid. You must provide a valid branch name, tag, or full commit ID.
-
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/async_code_commit.py
3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 | |