|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use NotesMergeConflictException | |
|---|---|
| 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 | |
|---|---|
Note |
NoteMerger.merge(Note base,
Note ours,
Note their,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes. |
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||