org.openl.rules.repository.api

Class MergeConflictException

java.lang.Object

java.lang.Throwable

java.lang.Exception

java.io.IOException

org.openl.rules.repository.api.MergeConflictException

All Implemented Interfaces:

Serializable

public class MergeConflictException
extends IOException

See Also:

Serialized Form

Constructor Summary

Constructors

Constructor and Description
MergeConflictException(Map<String,String> diffs, String baseCommit, String yourCommit, String theirCommit)

Method Summary

Modifier and Type	Method and Description
String	getBaseCommit()
Collection<String>	getConflictedFiles()
Map<String,String>	getDiffs()
String	getTheirCommit()
String	getYourCommit()

Methods inherited from class java.lang.Throwable

addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeConflictException

public MergeConflictException(Map<String,String> diffs,
                              String baseCommit,
                              String yourCommit,
                              String theirCommit)

Method Detail

getConflictedFiles

public Collection<String> getConflictedFiles()

getYourCommit

public String getYourCommit()

getTheirCommit

public String getTheirCommit()

getBaseCommit

public String getBaseCommit()

getDiffs

public Map<String,String> getDiffs()