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

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

Overview

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

See Also:

Constant Summary collapse

SENSITIVE = 
[]

Instance Attribute Summary collapse

Instance Attribute Details

#base ⇒ Types::MergeHunkDetail

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

Returns:



4824
4825
4826
4827
4828
4829
4830
4831
 
# File 'lib/aws-sdk-codecommit/types.rb', line 4824

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

#destination ⇒ Types::MergeHunkDetail

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

Returns:



4824
4825
4826
4827
4828
4829
4830
4831
 
# File 'lib/aws-sdk-codecommit/types.rb', line 4824

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

#is_conflict ⇒ Boolean

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) 


4824
4825
4826
4827
4828
4829
4830
4831
 
# File 'lib/aws-sdk-codecommit/types.rb', line 4824

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

#source ⇒ Types::MergeHunkDetail

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

Returns:



4824
4825
4826
4827
4828
4829
4830
4831
 
# File 'lib/aws-sdk-codecommit/types.rb', line 4824

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