public class NoteMapMerger extends Object
Direct implementation of NoteMap merger without using
TreeWalk
and
AbstractTreeIterator
Constructor and Description |
---|
NoteMapMerger(Repository db)
Constructs a NoteMapMerger with
DefaultNoteMerger as the merger for notes
and the MergeStrategy.RESOLVE as the
strategy for resolving conflicts on non-notes |
NoteMapMerger(Repository db,
NoteMerger noteMerger,
MergeStrategy nonNotesMergeStrategy)
Constructs a NoteMapMerger with custom
NoteMerger and custom
MergeStrategy . |
Modifier and Type | Method and Description |
---|---|
NoteMap |
merge(NoteMap base,
NoteMap ours,
NoteMap theirs)
Performs the merge.
|
public NoteMapMerger(Repository db, NoteMerger noteMerger, MergeStrategy nonNotesMergeStrategy)
NoteMerger
and custom
MergeStrategy
.db
- Git repositorynoteMerger
- note merger for merging conflicting changes on a notenonNotesMergeStrategy
- merge strategy for merging non-note entriespublic NoteMapMerger(Repository db)
DefaultNoteMerger
as the merger for notes
and the MergeStrategy.RESOLVE
as the
strategy for resolving conflicts on non-notesdb
- Git repositorypublic NoteMap merge(NoteMap base, NoteMap ours, NoteMap theirs) throws IOException
base
- base version of the note treeours
- ours version of the note treetheirs
- theirs version of the note treeIOException
Copyright © 2020 Eclipse JGit Project. All rights reserved.