Examples of org.eclipse.jgit.notes.NoteMerger.merge()

org.eclipse.jgit.notes.NoteMerger.merge()

Merges the conflicting note changes.

base, ours and their are all notes on the same object. @param base version of the Note @param ours version of the Note @param their version of the Note @param reader the object reader that must be used to read Git objects @param inserter the object inserter that must be used to insert Git objects @return the merge result @throws NotesMergeConflictException in case there was a merge conflict which this note merger couldn't resolve @throws IOException in case the reader or the inserter would throw an IOException the implementor will most likely want to propagate it as it can't do much to recover from it

      // means: base == null
      // there is not really a common ancestry for these two note revisions
      // use the same NoteMerger that is used from the NoteMapMerger
      NoteMerger noteMerger = new ReviewNoteMerger();
      Note newNote = new Note(c, noteContent);
      noteContent = noteMerger.merge(null, newNote, ours.getNote(c),
          reader, inserter).getData();
    }
    ours.set(c, noteContent);
  }

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.