public class MergeConflictException extends IOException
| Constructor and Description |
|---|
MergeConflictException(Map<String,String> diffs,
String baseCommit,
String yourCommit,
String theirCommit) |
| Modifier and Type | Method and Description |
|---|---|
String |
getBaseCommit() |
Collection<String> |
getConflictedFiles() |
Map<String,String> |
getDiffs() |
String |
getTheirCommit() |
String |
getYourCommit() |
addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toStringCopyright © 2004–2020 OpenL Tablets. All rights reserved.