Interface ConflictResolution.Builder

    • Method Detail

      • replaceContents

        ConflictResolution.Builder replaceContents​(Collection<ReplaceContentEntry> replaceContents)

        Files to have content replaced as part of the merge conflict resolution.

        Parameters:
        replaceContents - Files to have content replaced as part of the merge conflict resolution.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • replaceContents

        ConflictResolution.Builder replaceContents​(ReplaceContentEntry... replaceContents)

        Files to have content replaced as part of the merge conflict resolution.

        Parameters:
        replaceContents - Files to have content replaced as part of the merge conflict resolution.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • deleteFiles

        ConflictResolution.Builder deleteFiles​(Collection<DeleteFileEntry> deleteFiles)

        Files to be deleted as part of the merge conflict resolution.

        Parameters:
        deleteFiles - Files to be deleted as part of the merge conflict resolution.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • deleteFiles

        ConflictResolution.Builder deleteFiles​(DeleteFileEntry... deleteFiles)

        Files to be deleted as part of the merge conflict resolution.

        Parameters:
        deleteFiles - Files to be deleted as part of the merge conflict resolution.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • setFileModes

        ConflictResolution.Builder setFileModes​(Collection<SetFileModeEntry> setFileModes)

        File modes that are set as part of the merge conflict resolution.

        Parameters:
        setFileModes - File modes that are set as part of the merge conflict resolution.
        Returns:
        Returns a reference to this object so that method calls can be chained together.
      • setFileModes

        ConflictResolution.Builder setFileModes​(SetFileModeEntry... setFileModes)

        File modes that are set as part of the merge conflict resolution.

        Parameters:
        setFileModes - File modes that are set as part of the merge conflict resolution.
        Returns:
        Returns a reference to this object so that method calls can be chained together.