Package org.eclipse.emf.cdo.spi.server

# Klasse ICommitConflictResolver.Merging

java.lang.Object
org.eclipse.emf.cdo.spi.server.ICommitConflictResolver.Merging

Alle implementierten Schnittstellen:
  `ICommitConflictResolver`

Umschließende Schnittstelle:
  `ICommitConflictResolver`

public static class ICommitConflictResolver.Merging extends Object implements ICommitConflictResolver

Autor:
  Eike Stepper

## Verschachtelte Klassen - Übersicht

## Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen org.eclipse.emf.cdo.spi.server.ICommitConflictResolver

`ICommitConflictResolver.Merging`

## Konstruktorübersicht

Konstruktoren
Konstruktor
Beschreibung
`Merging()`

## Methodenübersicht

Modifizierer und Typ
Methode
Beschreibung
`protected CDOMerger`
`createMerger()`
`CDOChangeSetData`
`resolveConflicts(IStoreAccessor.CommitContext commitContext, List<InternalCDORevisionDelta> conflicts)`
When this method is called, the `IStoreAccessor.CommitContext.getOldRevisions()` map is filled with the latest valid revisions, chunks ensured.

### Von Klasse geerbte Methoden java.lang.Object

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

## Konstruktordetails

### Merging

public Merging()

## Methodendetails

### resolveConflicts

public CDOChangeSetData resolveConflicts(IStoreAccessor.CommitContext commitContext, List<InternalCDORevisionDelta> conflicts)
Beschreibung aus Schnittstelle kopiert: `ICommitConflictResolver`
When this method is called, the `IStoreAccessor.CommitContext.getOldRevisions()` map is filled with the latest valid revisions, chunks ensured.

Angegeben von:
  `resolveConflicts` in Schnittstelle `ICommitConflictResolver`

### createMerger

protected CDOMerger createMerger()