|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
public interface NoteMerger
Three-way note merge operation.
This operation takes three versions of a note: base, ours and theirs, performs the three-way merge and returns the merge result.
Method Summary | |
---|---|
Note |
merge(Note base,
Note ours,
Note their,
ObjectReader reader,
ObjectInserter inserter)
Merges the conflicting note changes. |
Method Detail |
---|
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 objects
NotesMergeConflictException
- in case there was a merge conflict which this note merger
couldn't resolve
IOException
- 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 it
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |