Class: Aws::CodeCommit::Types::ConflictResolution

Inherits:
Struct
  • Object
show all
Defined in:
gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb

Overview

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

Instance Attribute Details

#delete_filesArray<Types::DeleteFileEntry>

Files to be deleted as part of the merge conflict resolution.

Returns:



1254
1255
1256
1257
1258
1259
1260
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1254

class ConflictResolution < Struct.new(
  :replace_contents,
  :delete_files,
  :set_file_modes)
  SENSITIVE = []
  include Aws::Structure
end

#replace_contentsArray<Types::ReplaceContentEntry>

Files to have content replaced as part of the merge conflict resolution.

Returns:



1254
1255
1256
1257
1258
1259
1260
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1254

class ConflictResolution < Struct.new(
  :replace_contents,
  :delete_files,
  :set_file_modes)
  SENSITIVE = []
  include Aws::Structure
end

#set_file_modesArray<Types::SetFileModeEntry>

File modes that are set as part of the merge conflict resolution.

Returns:



1254
1255
1256
1257
1258
1259
1260
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1254

class ConflictResolution < Struct.new(
  :replace_contents,
  :delete_files,
  :set_file_modes)
  SENSITIVE = []
  include Aws::Structure
end