Select your cookie preferences

We use essential cookies and similar tools that are necessary to provide our site and services. We use performance cookies to collect anonymous statistics, so we can understand how customers use our site and make improvements. Essential cookies cannot be deactivated, but you can choose “Customize” or “Decline” to decline performance cookies.

If you agree, AWS and approved third parties will also use cookies to provide useful site features, remember your preferences, and display relevant content, including relevant advertising. To accept or decline all non-essential cookies, choose “Accept” or “Decline.” To make more detailed choices, choose “Customize.”

ConflictResolution - AWS CodeCommit

ConflictResolution

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Contents

deleteFiles

Files to be deleted as part of the merge conflict resolution.

Type: Array of DeleteFileEntry objects

Required: No

replaceContents

Files to have content replaced as part of the merge conflict resolution.

Type: Array of ReplaceContentEntry objects

Required: No

setFileModes

File modes that are set as part of the merge conflict resolution.

Type: Array of SetFileModeEntry objects

Required: No

See Also

For more information about using this API in one of the language-specific AWS SDKs, see the following:

PrivacySite termsCookie preferences
© 2025, Amazon Web Services, Inc. or its affiliates. All rights reserved.