public static class ICommitConflictResolver.Merging extends java.lang.Object implements ICommitConflictResolver
ICommitConflictResolver.Merging
Constructor and Description |
---|
Merging() |
Modifier and Type | Method and Description |
---|---|
protected CDOMerger |
createMerger() |
CDOChangeSetData |
resolveConflicts(IStoreAccessor.CommitContext commitContext,
java.util.List<InternalCDORevisionDelta> conflicts)
When this method is called, the
IStoreAccessor.CommitContext.getOldRevisions() map is filled with the latest valid revisions, chunks ensured. |
public CDOChangeSetData resolveConflicts(IStoreAccessor.CommitContext commitContext, java.util.List<InternalCDORevisionDelta> conflicts)
ICommitConflictResolver
IStoreAccessor.CommitContext.getOldRevisions()
map is filled with the latest valid revisions, chunks ensured.resolveConflicts
in interface ICommitConflictResolver
protected CDOMerger createMerger()
Copyright (c) 2004-2019 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html