org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge
Class MergeProjectHandler

java.lang.Object
  org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.AbstractConflictResolver
      org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.MergeProjectHandler

All Implemented Interfaces:

ConflictResolver

public class MergeProjectHandler
extends AbstractConflictResolver

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

Author:

wesendon

Constructor Summary

MergeProjectHandler(boolean isBranchMerge)
Default constructor.

Method Summary

Methods inherited from class org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.AbstractConflictResolver

resolveConflicts

Methods inherited from class java.lang.Object

equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MergeProjectHandler

public MergeProjectHandler(boolean isBranchMerge)

Default constructor.

Parameters:

isBranchMerge - specifies whether two branches are merged, rather then changes from the same branches.