java.lang.Object
java.lang.Throwable
java.lang.Exception
java.io.IOException
org.eclipse.jgit.notes.NotesMergeConflictException
- All Implemented Interfaces:
Serializable
This exception will be thrown from the
NoteMerger
when a conflict on Notes content is
found during merge.- See Also:
-
Constructor Summary
ConstructorsConstructorDescriptionNotesMergeConflictException
(org.eclipse.jgit.notes.NonNoteEntry base, org.eclipse.jgit.notes.NonNoteEntry ours, org.eclipse.jgit.notes.NonNoteEntry theirs) Constructs a NotesMergeConflictException for the specified base, ours and theirs versions of the root note tree.NotesMergeConflictException
(Note base, Note ours, Note theirs) Construct a NotesMergeConflictException for the specified base, ours and theirs note versions. -
Method Summary
Methods inherited from class java.lang.Throwable
addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
-
Constructor Details
-
NotesMergeConflictException
Construct a NotesMergeConflictException for the specified base, ours and theirs note versions.- Parameters:
base
- note versionours
- note versiontheirs
- note version
-
NotesMergeConflictException
public NotesMergeConflictException(org.eclipse.jgit.notes.NonNoteEntry base, org.eclipse.jgit.notes.NonNoteEntry ours, org.eclipse.jgit.notes.NonNoteEntry theirs) Constructs a NotesMergeConflictException for the specified base, ours and theirs versions of the root note tree.- Parameters:
base
- version of the root note treeours
- version of the root note treetheirs
- version of the root note tree
-