Class DescribeMergeConflictsResponse

    • Method Detail

      • conflictMetadata

        public final ConflictMetadata conflictMetadata()

        Contains metadata about the conflicts found in the merge.

        Returns:
        Contains metadata about the conflicts found in the merge.
      • hasMergeHunks

        public final boolean hasMergeHunks()
        For responses, this returns true if the service returned a value for the MergeHunks 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.
      • mergeHunks

        public final List<MergeHunk> mergeHunks()

        A list of merge hunks of the differences between the files or lines.

        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 hasMergeHunks() method.

        Returns:
        A list of merge hunks of the differences between the files or lines.
      • nextToken

        public final String nextToken()

        An enumeration token that can be used in a request to return the next batch of the results.

        Returns:
        An enumeration token that can be used in a request to return the next batch of the results.
      • destinationCommitId

        public final String destinationCommitId()

        The commit ID of the destination commit specifier that was used in the merge evaluation.

        Returns:
        The commit ID of the destination commit specifier that was used in the merge evaluation.
      • sourceCommitId

        public final String sourceCommitId()

        The commit ID of the source commit specifier that was used in the merge evaluation.

        Returns:
        The commit ID of the source commit specifier that was used in the merge evaluation.
      • baseCommitId

        public final String baseCommitId()

        The commit ID of the merge base.

        Returns:
        The commit ID of the merge base.
      • 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