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
-
-
Field Summary
Fields Modifier and Type Field Description private static long
serialVersionUID
-
Constructor Summary
Constructors Constructor Description NotesMergeConflictException(NonNoteEntry base, NonNoteEntry ours, 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
All Methods Static Methods Concrete Methods Modifier and Type Method Description private static java.lang.String
name(NonNoteEntry e)
private static java.lang.String
noteData(Note n)
private static java.lang.String
noteOn(Note base, Note ours, Note theirs)
-
-
-
Field Detail
-
serialVersionUID
private static final long serialVersionUID
- See Also:
- Constant Field Values
-
-
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(NonNoteEntry base, NonNoteEntry ours, 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
-
-
Method Detail
-
noteData
private static java.lang.String noteData(Note n)
-
name
private static java.lang.String name(NonNoteEntry e)
-
-