Class: Aws::CodeCommit::Types::ConflictMetadata

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

Overview

Information about the metadata for a conflict in a merge operation.

See Also:

Constant Summary collapse

SENSITIVE = 
[]

Instance Attribute Summary collapse

Instance Attribute Details

#content_conflict ⇒ Boolean

A boolean value indicating whether there are conflicts in the content of a file.

Returns:

  • (Boolean) 


1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_mode_conflict ⇒ Boolean

A boolean value indicating whether there are conflicts in the file mode of a file.

Returns:

  • (Boolean) 


1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_modes ⇒ Types::FileModes

The file modes of the file in the source, destination, and base of the merge.

Returns:



1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_path ⇒ String

The path of the file that contains conflicts.

Returns:

  • (String) 


1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#file_sizes ⇒ Types::FileSizes

The file sizes of the file in the source, destination, and base of the merge.

Returns:



1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#is_binary_file ⇒ Types::IsBinaryFile

A boolean value (true or false) indicating whether the file is binary or textual in the source, destination, and base of the merge.

Returns:



1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#merge_operations ⇒ Types::MergeOperations

Whether an add, modify, or delete operation caused the conflict between the source and destination of the merge.

Returns:



1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#number_of_conflicts ⇒ Integer

The number of conflicts, including both hunk conflicts and metadata conflicts.

Returns:

  • (Integer) 


1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#object_type_conflict ⇒ Boolean

A boolean value (true or false) indicating whether there are conflicts between the branches in the object type of a file, folder, or submodule.

Returns:

  • (Boolean) 


1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end

#object_types ⇒ Types::ObjectTypes

Information about any object type conflicts in a merge operation.

Returns:



1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
 
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 1260

class ConflictMetadata < Struct.new(
  :file_path,
  :file_sizes,
  :file_modes,
  :object_types,
  :number_of_conflicts,
  :is_binary_file,
  :content_conflict,
  :file_mode_conflict,
  :object_type_conflict,
  :merge_operations)
  SENSITIVE = []
  include Aws::Structure
end