You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.
Class: Aws::CodeCommit::Types::ConflictResolution
- Inherits:
-
Struct
- Object
- Struct
- Aws::CodeCommit::Types::ConflictResolution
- Defined in:
- (unknown)
Overview
Note:
When passing ConflictResolution as input to an Aws::Client method, you can use a vanilla Hash:
{
replace_contents: [
{
file_path: "Path", # required
replacement_type: "KEEP_BASE", # required, accepts KEEP_BASE, KEEP_SOURCE, KEEP_DESTINATION, USE_NEW_CONTENT
content: "data",
file_mode: "EXECUTABLE", # accepts EXECUTABLE, NORMAL, SYMLINK
},
],
delete_files: [
{
file_path: "Path", # required
},
],
set_file_modes: [
{
file_path: "Path", # required
file_mode: "EXECUTABLE", # required, accepts EXECUTABLE, NORMAL, SYMLINK
},
],
}
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
Returned by:
Instance Attribute Summary collapse
-
#delete_files ⇒ Array<Types::DeleteFileEntry>
Files to be deleted as part of the merge conflict resolution.
-
#replace_contents ⇒ Array<Types::ReplaceContentEntry>
Files to have content replaced as part of the merge conflict resolution.
-
#set_file_modes ⇒ Array<Types::SetFileModeEntry>
File modes that are set as part of the merge conflict resolution.
Instance Attribute Details
#delete_files ⇒ Array<Types::DeleteFileEntry>
Files to be deleted as part of the merge conflict resolution.
#replace_contents ⇒ Array<Types::ReplaceContentEntry>
Files to have content replaced as part of the merge conflict resolution.
#set_file_modes ⇒ Array<Types::SetFileModeEntry>
File modes that are set as part of the merge conflict resolution.