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
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
mergeIntoConflictingBranch, mergeIntoEmptyBranch1Commit, mergeIntoEmptyBranch3Commits, mergeIntoEmptyBranchModifying, mergeIntoNonConflictingBranch, mergeIntoNonExistingBranch, mergeIntoNonExistingReference, mergeWithCommonAncestor, mergeWithConflictingKeys, nonEmptyFastForwardMerge, setupCommits
-
Methods inherited from class org.projectnessie.versioned.tests.AbstractNestedVersionStore
assertCommitMeta, commit, commit, commit, commit, commitsList, commitsListMap, contentsWithoutId, contentWithoutId, contentWithoutId, delete, diffsWithoutContentId, filterMainBranch, forceCommit, operationsWithoutContentId, put, store, unchanged
-
-