|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object org.eclipse.jgit.notes.NoteMapMerger
public class NoteMapMerger
Three-way note tree merge.
Direct implementation of NoteMap merger without using TreeWalk
and
AbstractTreeIterator
Constructor Summary | |
---|---|
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 . |
Method Summary | |
---|---|
NoteMap |
merge(NoteMap base,
NoteMap ours,
NoteMap theirs)
Performs the merge. |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
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-notes
db
- Git repositoryMethod Detail |
---|
public 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 tree
IOException
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |