merge_branches_by_squash
¶
merge_branches_by_squash(
repository_name: RepositoryName,
source_commit_specifier: CommitName,
destination_commit_specifier: CommitName,
*,
config_overrides: Optional[CodeCommitClientConfig] = None,
target_branch: Optional[BranchName] = None,
conflict_detail_level: Optional[ConflictDetailLevelTypeEnum] = None,
conflict_resolution_strategy: Optional[ConflictResolutionStrategyTypeEnum] = None,
author_name: Optional[Name] = None,
email: Optional[Email] = None,
commit_message: Optional[Message] = None,
keep_empty_folders: Optional[KeepEmptyFolders] = None,
conflict_resolution: Optional[ConflictResolution] = None,
) -> MergeBranchesBySquashOutput
Merges two branches using the squash merge strategy.
Parameters:
-
repository_name(RepositoryName) –The name of the repository where you want to merge two branches.
-
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).
-
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).
-
target_branch(Optional[BranchName], default:None) –The branch where the merge is applied.
-
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.
-
author_name(Optional[Name], default:None) –The name of the author who created the commit. This information is used as both the author and committer for the commit.
-
email(Optional[Email], default:None) –The email address of the person merging the branches. This information is used in the commit information for the merge.
-
commit_message(Optional[Message], default:None) –The commit message for the merge.
-
keep_empty_folders(Optional[KeepEmptyFolders], default:None) –If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file is created for empty folders. The default is false.
-
conflict_resolution(Optional[ConflictResolution], default:None) –If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
Raises:
-
BranchDoesNotExistException–The specified branch does not exist.
-
BranchNameIsTagNameException–The specified branch name is not valid because it is a tag name. Enter the name of a branch in the repository. For a list of valid branch names, use ListBranches.
-
BranchNameRequiredException–A branch name is required, but was not specified.
-
CommitDoesNotExistException–The specified commit does not exist or no commit was specified, and the specified repository has no default branch.
-
CommitMessageLengthExceededException–The commit message is too long. Provide a shorter string.
-
CommitRequiredException–A commit was not specified.
-
ConcurrentReferenceUpdateException–The merge cannot be completed because the target branch has been modified. Another user might have modified the target branch while the merge was in progress. Wait a few minutes, and then try again.
-
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.
-
FileContentSizeLimitExceededException–The file cannot be added because it is too large. The maximum file size is 6 MB, and the combined file content change size is 7 MB. Consider making these changes using a Git client.
-
FileModeRequiredException–The commit cannot be created because no file mode has been specified. A file mode is required to update mode permissions for a file.
-
FolderContentSizeLimitExceededException–The commit cannot be created because at least one of the overall changes in the commit results in a folder whose contents exceed the limit of 6 MB. Either reduce the number and size of your changes, or split the changes across multiple folders.
-
InvalidBranchNameException–The specified reference name is not valid.
-
InvalidCommitException–The specified commit is not valid.
-
InvalidConflictDetailLevelException–The specified conflict detail level is not valid.
-
InvalidConflictResolutionException–The specified conflict resolution list is not valid.
-
InvalidConflictResolutionStrategyException–The specified conflict resolution strategy is not valid.
-
InvalidEmailException–The specified email address either contains one or more characters that are not allowed, or it exceeds the maximum number of characters allowed for an email address.
-
InvalidFileModeException–The specified file mode permission is not valid. For a list of valid file mode permissions, see PutFile.
-
InvalidPathException–The specified path is not valid.
-
InvalidReplacementContentException–Automerge was specified for resolving the conflict, but the replacement type is not valid or content is missing.
-
InvalidReplacementTypeException–Automerge was specified for resolving the conflict, but the specified replacement type 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.
-
InvalidTargetBranchException–The specified target branch is not valid.
-
ManualMergeRequiredException–The pull request cannot be merged automatically into the destination branch. You must manually merge the branches and resolve any conflicts.
-
MaximumConflictResolutionEntriesExceededException–The number of allowed conflict resolution entries was exceeded.
-
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.
-
MultipleConflictResolutionEntriesException–More than one conflict resolution entries exists for the conflict. A conflict can have only one conflict resolution entry.
-
NameLengthExceededException–The user name is not valid because it has exceeded the character limit for author names.
-
PathRequiredException–The folderPath for a location cannot be null.
-
ReplacementContentRequiredException–USE_NEW_CONTENT was specified, but no replacement content has been provided.
-
ReplacementTypeRequiredException–A replacement type is required.
-
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
4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 | |