Package com.intellij.openapi.vcs.checkin

Class UnresolvedMergeCheckProvider

java.lang.Object

com.intellij.openapi.vcs.checkin.UnresolvedMergeCheckProvider

public abstract class UnresolvedMergeCheckProvider
extends java.lang.Object

Field Summary

Fields

Modifier and Type	Field and Description
static ExtensionPointName<UnresolvedMergeCheckProvider>	EP_NAME

Constructor Summary

Constructors

Constructor and Description
UnresolvedMergeCheckProvider()

Method Summary

Modifier and Type	Method and Description
abstract CheckinHandler.ReturnResult	checkUnresolvedConflicts(CheckinProjectPanel panel, CommitContext commitContext, CommitExecutor executor)

Methods inherited from class java.lang.Object

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

Field Detail

EP_NAME

public static final ExtensionPointName<UnresolvedMergeCheckProvider> EP_NAME

Constructor Detail

UnresolvedMergeCheckProvider

public UnresolvedMergeCheckProvider()

Method Detail

checkUnresolvedConflicts

public abstract CheckinHandler.ReturnResult checkUnresolvedConflicts(CheckinProjectPanel panel,
                                                                     CommitContext commitContext,
                                                                     CommitExecutor executor)