Package software.amazon.awssdk.services.codecommit.model

Interface GetMergeOptionsRequest.Builder

    • Method Detail

      • repositoryName

        GetMergeOptionsRequest.Builder repositoryName​(String repositoryName)

        The name of the repository that contains the commits about which you want to get merge options.

        Parameters:
        repositoryName - The name of the repository that contains the commits about which you want to get merge options.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • sourceCommitSpecifier

        GetMergeOptionsRequest.Builder sourceCommitSpecifier​(String sourceCommitSpecifier)

        The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

        Parameters:
        sourceCommitSpecifier - The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • destinationCommitSpecifier

        GetMergeOptionsRequest.Builder destinationCommitSpecifier​(String destinationCommitSpecifier)

        The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

        Parameters:
        destinationCommitSpecifier - The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • conflictDetailLevel

        GetMergeOptionsRequest.Builder conflictDetailLevel​(String conflictDetailLevel)

        The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

        Parameters:
        conflictDetailLevel - The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
        See Also:
        ConflictDetailLevelTypeEnum, ConflictDetailLevelTypeEnum

      • conflictDetailLevel

        GetMergeOptionsRequest.Builder conflictDetailLevel​(ConflictDetailLevelTypeEnum conflictDetailLevel)

        The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

        Parameters:
        conflictDetailLevel - The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
        See Also:
        ConflictDetailLevelTypeEnum, ConflictDetailLevelTypeEnum

      • conflictResolutionStrategy

        GetMergeOptionsRequest.Builder conflictResolutionStrategy​(String conflictResolutionStrategy)

        Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

        Parameters:
        conflictResolutionStrategy - Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
        See Also:
        ConflictResolutionStrategyTypeEnum, ConflictResolutionStrategyTypeEnum

      • conflictResolutionStrategy

        GetMergeOptionsRequest.Builder conflictResolutionStrategy​(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy)

        Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

        Parameters:
        conflictResolutionStrategy - Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
        See Also:
        ConflictResolutionStrategyTypeEnum, ConflictResolutionStrategyTypeEnum