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: