Class BatchDescribeMergeConflictsRequest

    • Method Detail

      • repositoryName

        public final String repositoryName()

        The name of the repository that contains the merge conflicts you want to review.

        Returns:
        The name of the repository that contains the merge conflicts you want to review.
      • destinationCommitSpecifier

        public final 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).

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

        public final 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).

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

        public final Integer maxMergeHunks()

        The maximum number of merge hunks to include in the output.

        Returns:
        The maximum number of merge hunks to include in the output.
      • maxConflictFiles

        public final Integer maxConflictFiles()

        The maximum number of files to include in the output.

        Returns:
        The maximum number of files to include in the output.
      • hasFilePaths

        public final boolean hasFilePaths()
        For responses, this returns true if the service returned a value for the FilePaths property. This DOES NOT check that the value is non-empty (for which, you should check the isEmpty() method on the property). This is useful because the SDK will never return a null collection or map, but you may need to differentiate between the service returning nothing (or null) and the service returning an empty collection or map. For requests, this returns true if a value for the property was specified in the request builder, and false if a value was not specified.
      • filePaths

        public final List<String> filePaths()

        The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.

        Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.

        This method will never return null. If you would like to know whether the service returned this field (so that you can differentiate between null and empty), you can use the hasFilePaths() method.

        Returns:
        The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.
      • conflictDetailLevel

        public final 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.

        If the service returns an enum value that is not available in the current SDK version, conflictDetailLevel will return ConflictDetailLevelTypeEnum.UNKNOWN_TO_SDK_VERSION. The raw value returned by the service is available from conflictDetailLevelAsString().

        Returns:
        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.
        See Also:
        ConflictDetailLevelTypeEnum
      • conflictDetailLevelAsString

        public final String conflictDetailLevelAsString()

        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.

        If the service returns an enum value that is not available in the current SDK version, conflictDetailLevel will return ConflictDetailLevelTypeEnum.UNKNOWN_TO_SDK_VERSION. The raw value returned by the service is available from conflictDetailLevelAsString().

        Returns:
        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.
        See Also:
        ConflictDetailLevelTypeEnum
      • conflictResolutionStrategyAsString

        public final String conflictResolutionStrategyAsString()

        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.

        If the service returns an enum value that is not available in the current SDK version, conflictResolutionStrategy will return ConflictResolutionStrategyTypeEnum.UNKNOWN_TO_SDK_VERSION . The raw value returned by the service is available from conflictResolutionStrategyAsString().

        Returns:
        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.
        See Also:
        ConflictResolutionStrategyTypeEnum
      • nextToken

        public final String nextToken()

        An enumeration token that, when provided in a request, returns the next batch of the results.

        Returns:
        An enumeration token that, when provided in a request, returns the next batch of the results.
      • toString

        public final String toString()
        Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be redacted from this string using a placeholder value.
        Overrides:
        toString in class Object