java.lang.Object
org.eclipse.jgit.notes.NoteMapMerger
Three-way note tree merge.
Direct implementation of NoteMap merger without using
TreeWalk
and
AbstractTreeIterator
-
Constructor Summary
ConstructorsConstructorDescriptionConstructs a NoteMapMerger withDefaultNoteMerger
as the merger for notes and theMergeStrategy.RESOLVE
as the strategy for resolving conflicts on non-notesNoteMapMerger
(Repository db, NoteMerger noteMerger, MergeStrategy nonNotesMergeStrategy) Constructs a NoteMapMerger with customNoteMerger
and customMergeStrategy
. -
Method Summary
-
Constructor Details
-
NoteMapMerger
Constructs a NoteMapMerger with customNoteMerger
and customMergeStrategy
.- Parameters:
db
- Git repositorynoteMerger
- note merger for merging conflicting changes on a notenonNotesMergeStrategy
- merge strategy for merging non-note entries
-
NoteMapMerger
Constructs a NoteMapMerger withDefaultNoteMerger
as the merger for notes and theMergeStrategy.RESOLVE
as the strategy for resolving conflicts on non-notes- Parameters:
db
- Git repository
-
-
Method Details
-
merge
Performs the merge.- Parameters:
base
- base version of the note treeours
- ours version of the note treetheirs
- theirs version of the note tree- Returns:
- merge result as a new NoteMap
- Throws:
IOException
- if an IO error occurred
-