Package org.projectnessie.model

Interface MergeResponse

@Immutable public interface MergeResponse

  • Method Details

    • wasApplied

      @Default default boolean wasApplied()
      Indicates whether the merge or transplant operation has been applied.

    • wasSuccessful

      @Default default boolean wasSuccessful()
      Indicates whether the merge or transplant operation was successful without any conflicts.

    • getResultantTargetHash

      @Nullable @Nullable String getResultantTargetHash()
      Commit-ID of the target branch after the merge/transplant operation.

    • getCommonAncestor

      @Nullable @Nullable String getCommonAncestor()
      Commit-ID of the identified merge base, only returned for a merge operation.

      Note: earlier Nessie versions only supported merging using the common ancestor, so only considering the direct commit parents (predecessors). Nessie identifies the "nearest" merge-base singe version 0.61.0 (with the new storage model), and allows "incremental merges". Since renaming a public API fields is not good practice, this field represents the merge-base.

    • getTargetBranch

      String getTargetBranch()
      Name of the target branch.

    • getEffectiveTargetHash

      String getEffectiveTargetHash()
      Head commit-ID of the target branch identified by the merge or transplant operation.

    • getExpectedHash

      @Nullable @Nullable String getExpectedHash()
      The expected commit-ID of the target branch, as specified by the caller.

    • getSourceCommits

      @Deprecated List<LogResponse.LogEntry> getSourceCommits()
      Deprecated.

    • getTargetCommits

      @Nullable @Nullable @Deprecated List<LogResponse.LogEntry> getTargetCommits()
      Deprecated.

    • getDetails

      List<MergeResponse.ContentKeyDetails> getDetails()
      Details of all keys encountered during the merge or transplant operation.