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

# Schnittstelle ICommitConflictResolver

Alle bekannten Implementierungsklassen:
  `ICommitConflictResolver.Merging`

public interface ICommitConflictResolver

Seit:
  4.8
Autor:
  Eike Stepper

## Verschachtelte Klassen - Übersicht

Verschachtelte Klassen
Modifizierer und Typ
Schnittstelle
Beschreibung
`static class`
`ICommitConflictResolver.Merging`

## Methodenübersicht

Modifizierer und Typ
Methode
Beschreibung
`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.

## Methodendetails

### resolveConflicts

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.