create_unreferenced_merge_commit
¶
create_unreferenced_merge_commit(
repository_name: RepositoryName,
source_commit_specifier: CommitName,
destination_commit_specifier: CommitName,
merge_option: MergeOptionTypeEnum,
*,
config_overrides: Optional[CodeCommitClientConfig] = 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,
) -> CreateUnreferencedMergeCommitOutput
Creates an unreferenced commit that represents the result of merging two branches using a specified merge strategy. This can help you determine the outcome of a potential merge. This API cannot be used with the fast-forward merge strategy because that strategy does not create a merge commit.
This unreferenced merge commit can only be accessed using the GetCommit API or through git commands such as git fetch. To retrieve this commit, you must specify its commit ID or otherwise reference it.
Parameters:
-
repository_name(RepositoryName) –The name of the repository where you want to create the unreferenced merge commit.
-
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).
-
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.
-
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 unreferenced commit. This information is used as both the author and committer for the commit.
-
email(Optional[Email], default:None) –The email address for the person who created the unreferenced commit.
-
commit_message(Optional[Message], default:None) –The commit message for the unreferenced commit.
-
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:
-
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.
-
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.
-
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.
-
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.
-
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.
-
MergeOptionRequiredException–A merge option or stategy is required, and none was provided.
-
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
1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 | |