You are viewing documentation for version 2 of the AWS SDK for Ruby. Version 3 documentation can be found here.

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

Inherits:
Struct
  • Object
show all
Defined in:
(unknown)

Overview

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

Instance Attribute Summary collapse

Instance Attribute Details

#baseTypes::MergeHunkDetail

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

Returns:

#destinationTypes::MergeHunkDetail

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

Returns:

  • (Types::MergeHunkDetail)

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

#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. This will be true when the hunk represents a conflict and one or more files contains a line conflict. File mode conflicts in a merge will not set this to be true.

Returns:

  • (Boolean)

    A Boolean value indicating whether a combination of hunks contains a conflict.

#sourceTypes::MergeHunkDetail

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

Returns: