JGit 7.2.0.202503040940-r · org.eclipse.jgit.notes.NotesMergeConflictException

This exception will be thrown from the org.eclipse.jgit.notes.NoteMerger when a conflict on Notes content is found during merge.

Field Summary

Modifier and Type	Field and Description
private static final long	serialVersionUID Hides java.io.IOException.serialVersionUID.

Access	Constructor and Description
public	NotesMergeConflictException(Note note version base, Note note version ours, Note note version theirs) Construct a NotesMergeConflictException for the specified base, ours and theirs note versions.
public	NotesMergeConflictException(NonNoteEntry version of the root note tree base, NonNoteEntry version of the root note tree ours, NonNoteEntry version of the root note tree theirs) Constructs a NotesMergeConflictException for the specified base, ours and theirs versions of the root note tree.

Modifier and Type	Method and Description
private static String	name(NonNoteEntry e)
private static String	noteData(Note n)
private static String	noteOn(Note base, Note ours, Note theirs)

serialVersionUID	back to summary
private static final long serialVersionUID Hides java.io.IOException.serialVersionUID.

NotesMergeConflictException	back to summary
public NotesMergeConflictException(Note base, Note ours, Note theirs) Construct a NotesMergeConflictException for the specified base, ours and theirs note versions. Parameters base:Note note version ours:Note note version theirs:Note note version

NotesMergeConflictException

public NotesMergeConflictException(Note base, Note ours, Note theirs)

Construct a NotesMergeConflictException for the specified base, ours and theirs note versions.

Parameters

NotesMergeConflictException	back to summary
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:NonNoteEntry version of the root note tree ours:NonNoteEntry version of the root note tree theirs:NonNoteEntry version of the root note tree

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

name	back to summary
private static String name(NonNoteEntry e)

noteData	back to summary
private static String noteData(Note n)

noteOn	back to summary
private static String noteOn(Note base, Note ours, Note theirs)