AWS CodeCommit
API Reference (API Version 2015-04-13)

ConflictResolution

A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.

Contents

deleteFiles

Files that will be deleted as part of the merge conflict resolution.

Type: Array of DeleteFileEntry objects

Required: No

replaceContents

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

Type: Array of ReplaceContentEntry objects

Required: No

setFileModes

File modes that will be 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:

On this page: