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

Interface MergeBranchesByThreeWayRequest.Builder

    • Method Detail

      • repositoryName

        MergeBranchesByThreeWayRequest.Builder repositoryName​(String repositoryName)

        The name of the repository where you want to merge two branches.

        Parameters:
        repositoryName - The name of the repository where you want to merge two branches.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • sourceCommitSpecifier

        MergeBranchesByThreeWayRequest.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

        MergeBranchesByThreeWayRequest.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.

      • targetBranch

        MergeBranchesByThreeWayRequest.Builder targetBranch​(String targetBranch)

        The branch where the merge is applied.

        Parameters:
        targetBranch - The branch where the merge is applied.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • conflictDetailLevel

        MergeBranchesByThreeWayRequest.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

        MergeBranchesByThreeWayRequest.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

        MergeBranchesByThreeWayRequest.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

        MergeBranchesByThreeWayRequest.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

      • authorName

        MergeBranchesByThreeWayRequest.Builder authorName​(String authorName)

        The name of the author who created the commit. This information is used as both the author and committer for the commit.

        Parameters:
        authorName - The name of the author who created the commit. This information is used as both the author and committer for the commit.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • email

        MergeBranchesByThreeWayRequest.Builder email​(String email)

        The email address of the person merging the branches. This information is used in the commit information for the merge.

        Parameters:
        email - The email address of the person merging the branches. This information is used in the commit information for the merge.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • commitMessage

        MergeBranchesByThreeWayRequest.Builder commitMessage​(String commitMessage)

        The commit message to include in the commit information for the merge.

        Parameters:
        commitMessage - The commit message to include in the commit information for the merge.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • keepEmptyFolders

        MergeBranchesByThreeWayRequest.Builder keepEmptyFolders​(Boolean keepEmptyFolders)

        If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.

        Parameters:
        keepEmptyFolders - If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
        Returns:
        Returns a reference to this object so that method calls can be chained together.

      • conflictResolution

        MergeBranchesByThreeWayRequest.Builder conflictResolution​(ConflictResolution conflictResolution)

        If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

        Parameters:
        conflictResolution - If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
        Returns:
        Returns a reference to this object so that method calls can be chained together.