Interface Conflict.Builder

    • Method Detail

      • conflictMetadata

        Conflict.Builder conflictMetadata​(ConflictMetadata conflictMetadata)

        Metadata about a conflict in a merge operation.

        Parameters:
        conflictMetadata - Metadata about a conflict in a merge operation.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • mergeHunks

        Conflict.Builder mergeHunks​(Collection<MergeHunk> mergeHunks)

        A list of hunks that contain the differences between files or lines causing the conflict.

        Parameters:
        mergeHunks - A list of hunks that contain the differences between files or lines causing the conflict.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • mergeHunks

        Conflict.Builder mergeHunks​(MergeHunk... mergeHunks)

        A list of hunks that contain the differences between files or lines causing the conflict.

        Parameters:
        mergeHunks - A list of hunks that contain the differences between files or lines causing the conflict.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • mergeHunks

        Conflict.Builder mergeHunks​(Consumer<MergeHunk.Builder>... mergeHunks)

        A list of hunks that contain the differences between files or lines causing the conflict.

        This is a convenience method that creates an instance of the MergeHunk.Builder avoiding the need to create one manually via MergeHunk.builder().

        When the Consumer completes, SdkBuilder.build() is called immediately and its result is passed to #mergeHunks(List).

        Parameters:
        mergeHunks - a consumer that will call methods on MergeHunk.Builder
        Returns:
        Returns a reference to this object so that method calls can be chained together.
        See Also:
        #mergeHunks(java.util.Collection)