org.eclipse.jgit.notes.NoteMerger .
If ours and theirs are both non-null, which means they are either both edits or both adds, then this merger will simply join the content of ours and theirs (in that order) and return that as the merge result.
If one or ours/theirs is non-null and the other one is null then the non-null value is returned as the merge result. This means that an edit/delete conflict is resolved by keeping the edit version.
If both ours and theirs are null then the result of the merge is also null.
| Access | Constructor and Description |
|---|---|
| public |
| Modifier and Type | Method and Description |
|---|---|
| public Note | merge(Note
version of the Note base, Note version of the Note ours, Note version of the Note theirs, 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)Implements org. Merges the conflicting note changes. |
| DefaultNoteMerger | back to summary |
|---|---|
| public DefaultNoteMerger() | |
| merge | back to summary |
|---|---|
| public Note merge(Note base, Note ours, Note theirs, ObjectReader reader, ObjectInserter inserter) throws IOException Implements org. Doc from org. Merges the conflicting note changes. base, ours and their are all notes on the same object.
| |