org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging
Interface ConflictResolver

All Known Implementing Classes:

AbstractConflictResolver, MergeProjectHandler

public interface ConflictResolver

Represents a controller that can merge conflicting changes resulting in a list of changes that is not conflicting any more.

Author:

koegel, wesendon

Method Summary

boolean

resolveConflicts(Project project, ChangeConflictSet changeConflict) Resolves all conflicts between the given change packages "theirs" and the given local operations.

Method Detail

resolveConflicts

boolean resolveConflicts(Project project,
                         ChangeConflictSet changeConflict)

Resolves all conflicts between the given change packages "theirs" and the given local operations.

Parameters:

project - the project at the time were all local changes are already applied and their operations are NOT, in other words the base version plus local operations

changeConflict - the ChangeConflictSet that needs to be resolved

Returns:

true if the merge can proceed, false if it has to be cancelled