class Aws::CodeCommit::Types::ConflictResolution

@see docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ConflictResolution AWS API Documentation
@return [Array<Types::SetFileModeEntry>]
resolution.
File modes that will be set as part of the merge conflict
@!attribute [rw] set_file_modes
@return [Array<Types::DeleteFileEntry>]
Files that will be deleted as part of the merge conflict resolution.
@!attribute [rw] delete_files
@return [Array<Types::ReplaceContentEntry>]
Information about how a conflict in a merge will be resolved.
@!attribute [rw] replace_contents
}
],
},
file_mode: “EXECUTABLE”, # required, accepts EXECUTABLE, NORMAL, SYMLINK
file_path: “Path”, # required
{
set_file_modes: [
],
},
file_path: “Path”, # required
{
delete_files: [
],
},
file_mode: “EXECUTABLE”, # accepts EXECUTABLE, NORMAL, SYMLINK
content: “data”,
replacement_type: “KEEP_BASE”, # required, accepts KEEP_BASE, KEEP_SOURCE, KEEP_DESTINATION, USE_NEW_CONTENT
file_path: “Path”, # required
{
replace_contents: [
{
data as a hash:
@note When making an API call, you may pass ConflictResolution
AUTOMERGE is chosen as the conflict resolution strategy.
A list of inputs to use when resolving conflicts during a merge if