Package org.projectnessie.versioned.tests

Class AbstractVersionStoreTestBase.Merge

java.lang.Object

org.projectnessie.versioned.tests.AbstractNestedVersionStore

org.projectnessie.versioned.tests.AbstractMerge

org.projectnessie.versioned.tests.AbstractVersionStoreTestBase.Merge

Enclosing class:

AbstractVersionStoreTestBase

@Nested
protected class AbstractVersionStoreTestBase.Merge
extends AbstractMerge

Field Summary

Fields inherited from class org.projectnessie.versioned.tests.AbstractMerge

MAIN_BRANCH, soft

Fields inherited from class org.projectnessie.versioned.tests.AbstractNestedVersionStore

store

Constructor Summary

Constructors

Constructor	Description
Merge()

Method Summary

Methods inherited from class org.projectnessie.versioned.tests.AbstractMerge

mergeEmptyCommit, mergeFromAndIntoHead, mergeIntoConflictingBranch, mergeIntoNonExistingBranch, mergeIntoNonExistingReference, mergeKeyBehaviorValidation, mergeResolveConflict, setupCommits

Methods inherited from class org.projectnessie.versioned.tests.AbstractNestedVersionStore

assertCommitMeta, commit, commit, commit, commit, commit, commitsList, commitsListMap, contentsWithoutId, contentWithoutId, contentWithoutId, contentWithoutId, delete, diffsWithoutContentId, filterMainBranch, forceCommit, operationsWithoutContentId, put, storageCheckpoint, store, unchanged

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Details

Merge

public Merge()