Package org.projectnessie.versioned

Interface MergeResult.KeyDetails

  • Enclosing interface:
    MergeResult<COMMIT>
    @Immutable
public static interface MergeResult.KeyDetails

    • Method Detail

      • getMergeBehavior

        @Parameter(order=1)
org.projectnessie.model.MergeBehavior getMergeBehavior()

      • getConflictType

        @Deprecated
@Default
@Parameter(order=2)
default MergeResult.ConflictType getConflictType()
        Deprecated.

      • getSourceCommits

        @Deprecated
java.util.List<Hash> getSourceCommits()
        Deprecated.

      • getTargetCommits

        @Deprecated
java.util.List<Hash> getTargetCommits()
        Deprecated.

      • getConflict

        @Nullable
@Nullable
@Parameter(order=3)
org.projectnessie.model.Conflict getConflict()
        Optional message, usually present in case of a conflict.

      • builder

        static org.projectnessie.versioned.ImmutableKeyDetails.Builder builder()

      • keyDetails

        static MergeResult.KeyDetails keyDetails​(org.projectnessie.model.MergeBehavior mergeBehavior,
                                         org.projectnessie.model.Conflict conflict)