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

Packages that use ConflictResolver

org.eclipse.emf.emfstore.internal.client.model
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging
org.eclipse.emf.emfstore.internal.client.model.impl
org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge

Uses of ConflictResolver in org.eclipse.emf.emfstore.internal.client.model

Methods in org.eclipse.emf.emfstore.internal.client.model with parameters of type ConflictResolver

void	ProjectSpace.mergeBranch(PrimaryVersionSpec branchSpec, ConflictResolver conflictResolver, org.eclipse.core.runtime.IProgressMonitor monitor) Allows to merge a version from another branch into the current project space.

Uses of ConflictResolver in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging

Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging that implement ConflictResolver

class

AbstractConflictResolver Convenience super class for implementing ConflictResolver.

Uses of ConflictResolver in org.eclipse.emf.emfstore.internal.client.model.impl

Methods in org.eclipse.emf.emfstore.internal.client.model.impl with parameters of type ConflictResolver

void	ProjectSpaceBase.mergeBranch(PrimaryVersionSpec branchSpec, ConflictResolver conflictResolver, org.eclipse.core.runtime.IProgressMonitor monitor) Allows to merge a version from another branch into the current project space.

Uses of ConflictResolver in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge

Classes in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge that implement ConflictResolver

class

MergeProjectHandler This is an alternative merge handler, using the new merge wizard.