public class NotesMergeConflictException extends IOException
NoteMerger when a conflict on
Notes content is found during merge.| Constructor and 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.
|
addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toStringpublic NotesMergeConflictException(Note base, Note ours, Note theirs)
base - note versionours - note versiontheirs - note versionpublic NotesMergeConflictException(org.eclipse.jgit.notes.NonNoteEntry base,
org.eclipse.jgit.notes.NonNoteEntry ours,
org.eclipse.jgit.notes.NonNoteEntry theirs)
base - version of the root note treeours - version of the root note treetheirs - version of the root note treeCopyright © 2014. All rights reserved.