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

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

Modifier and Type	Method and Description
public Note	Returns: the merge result merge(Note version of the Note base, Note version of the Note ours, Note version of the Note their, ObjectReader the object reader that must be used to read Git objects reader, ObjectInserter the object inserter that must be used to insert Git objects inserter) Merges the conflicting note changes.

merge	back to summary
public Note merge(Note base, Note ours, Note their, ObjectReader reader, ObjectInserter inserter) throws NotesMergeConflictException, IOException Merges the conflicting note changes. base, ours and their are all notes on the same object. Parameters base:Note version of the Note ours:Note version of the Note their:Note version of the Note reader:ObjectReader the object reader that must be used to read Git objects inserter:ObjectInserter the object inserter that must be used to insert Git objects Returns:Note the merge result Exceptions 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 java.io.IOException the implementor will most likely want to propagate it as it can't do much to recover from it

merge

Merges the conflicting note changes.

base, ours and their are all notes on the same object.

Parameters

base:Note: version of the Note
ours:Note: version of the Note
their:Note: version of the Note
reader:ObjectReader: the object reader that must be used to read Git objects
inserter:ObjectInserter: the object inserter that must be used to insert Git objects

Returns:Note

the merge result

Exceptions

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 java.io.IOException the implementor will most likely want to propagate it as it can't do much to recover from it