Package org.eclipse.jgit.notes
Class NotesMergeConflictException
- java.lang.Object
-
- java.lang.Throwable
-
- java.lang.Exception
-
- java.io.IOException
-
- org.eclipse.jgit.notes.NotesMergeConflictException
-
- All Implemented Interfaces:
java.io.Serializable
public class NotesMergeConflictException extends java.io.IOException
This exception will be thrown from theNoteMerger
when a conflict on Notes content is found during merge.- See Also:
- Serialized Form
-
-
Constructor Summary
Constructors Constructor Description 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.NotesMergeConflictException(Note base, Note ours, Note theirs)
Construct a NotesMergeConflictException for the specified base, ours and theirs note versions.
-
-
-
Constructor Detail
-
NotesMergeConflictException
public NotesMergeConflictException(Note base, Note ours, Note theirs)
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
-
-