Class: Aws::CodeCommit::Types::MergeHunk

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

Overview

Information about merge hunks in a merge or pull request operation.

Constant Summary collapse

SENSITIVE =
[]

Instance Attribute Summary collapse

Instance Attribute Details

#baseTypes::MergeHunkDetail

Information about the merge hunk in the base of a merge or pull request.



5288
5289
5290
5291
5292
5293
5294
5295
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5288

class MergeHunk < Struct.new(
  :is_conflict,
  :source,
  :destination,
  :base)
  SENSITIVE = []
  include Aws::Structure
end

#destinationTypes::MergeHunkDetail

Information about the merge hunk in the destination of a merge or pull request.



5288
5289
5290
5291
5292
5293
5294
5295
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5288

class MergeHunk < Struct.new(
  :is_conflict,
  :source,
  :destination,
  :base)
  SENSITIVE = []
  include Aws::Structure
end

#is_conflictBoolean

A Boolean value indicating whether a combination of hunks contains a conflict. Conflicts occur when the same file or the same lines in a file were modified in both the source and destination of a merge or pull request. Valid values include true, false, and null. True when the hunk represents a conflict and one or more files contains a line conflict. File mode conflicts in a merge do not set this to true.

Returns:

  • (Boolean)


5288
5289
5290
5291
5292
5293
5294
5295
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5288

class MergeHunk < Struct.new(
  :is_conflict,
  :source,
  :destination,
  :base)
  SENSITIVE = []
  include Aws::Structure
end

#sourceTypes::MergeHunkDetail

Information about the merge hunk in the source of a merge or pull request.



5288
5289
5290
5291
5292
5293
5294
5295
# File 'gems/aws-sdk-codecommit/lib/aws-sdk-codecommit/types.rb', line 5288

class MergeHunk < Struct.new(
  :is_conflict,
  :source,
  :destination,
  :base)
  SENSITIVE = []
  include Aws::Structure
end