Uses of Class
org.eclipse.jgit.notes.NotesMergeConflictException

Packages that use NotesMergeConflictException

Package	Description
org.eclipse.jgit.notes	Git notes processing (for commits, etc).

Uses of NotesMergeConflictException in org.eclipse.jgit.notes

Methods in org.eclipse.jgit.notes that throw NotesMergeConflictException

Modifier and Type	Method	Description
Note	NoteMerger.merge(Note base, Note ours, Note their, ObjectReader reader, ObjectInserter inserter)	Merges the conflicting note changes.