public interface NoteMerger
This operation takes three versions of a note: base, ours and theirs, performs the three-way merge and returns the merge result.
| Modifier and Type | Method and Description |
|---|---|
Note |
merge(Note base,
Note ours,
Note their,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes.
|
Note merge(Note base, Note ours, Note their, ObjectReader reader, ObjectInserter inserter) throws NotesMergeConflictException, IOException
base, ours and their are all notes on the same object.
base - version of the Noteours - version of the Notetheir - version of the Notereader - the object reader that must be used to read Git objectsinserter - the object inserter that must be used to insert Git objectsNotesMergeConflictException - in case there was a merge conflict which this note merger
couldn't resolveIOException - in case the reader or the inserter would throw an IOException
the implementor will most likely want to propagate it as it
can't do much to recover from itCopyright © 2014. All rights reserved.