Class: Aws::CodeCommit::Types::ConflictResolution
- Inherits:
-
Struct
- Object
- Struct
- Aws::CodeCommit::Types::ConflictResolution
- Defined in:
- gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb
Overview
Note:
When making an API call, you may pass ConflictResolution data as a 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.
Constant Summary collapse
- SENSITIVE =
[]
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.
1334 1335 1336 1337 1338 1339 1340 |
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1334 class ConflictResolution < Struct.new( :replace_contents, :delete_files, :set_file_modes) SENSITIVE = [] include Aws::Structure end |
#replace_contents ⇒ Array<Types::ReplaceContentEntry>
Files to have content replaced as part of the merge conflict resolution.
1334 1335 1336 1337 1338 1339 1340 |
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1334 class ConflictResolution < Struct.new( :replace_contents, :delete_files, :set_file_modes) SENSITIVE = [] include Aws::Structure end |
#set_file_modes ⇒ Array<Types::SetFileModeEntry>
File modes that are set as part of the merge conflict resolution.
1334 1335 1336 1337 1338 1339 1340 |
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1334 class ConflictResolution < Struct.new( :replace_contents, :delete_files, :set_file_modes) SENSITIVE = [] include Aws::Structure end |