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

ReplaceContentEntry

Information about a replacement content entry in the conflict of a merge or pull request operation.

Contents

content

The base-64 encoded content to use when the replacement type is USE_NEW_CONTENT.

Type: Base64-encoded binary data object

Length Constraints: Maximum length of 6291456.

Required: No

fileMode

The file mode to apply during conflict resoltion.

Type: String

Valid Values: EXECUTABLE | NORMAL | SYMLINK

Required: No

filePath

The path of the conflicting file.

Type: String

Required: Yes

replacementType

The replacement type to use when determining how to resolve the conflict.

Type: String

Valid Values: KEEP_BASE | KEEP_SOURCE | KEEP_DESTINATION | USE_NEW_CONTENT

Required: Yes

See Also

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

On this page: