public interface CDOMerger
change set
and a target change set
and returns the result relative to their common ancestor.Modifier and Type | Interface and Description |
---|---|
static class |
CDOMerger.ConflictException
Thrown from a
merger in case of conflicting changes in the a source and target
change sets . |
Modifier and Type | Method and Description |
---|---|
CDOChangeSetData |
merge(CDOChangeSet target,
CDOChangeSet source)
Calculates the changes between a source
change set and a target change
set and returns the result relative to their common ancestor. |
CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws CDOMerger.ConflictException
change set
and a target change
set
and returns the result relative to their common ancestor.CDOMerger.ConflictException
Copyright (c) 2014 Eike Stepper (Berlin, 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