Class NotesMergeConflictException

java.lang.Object
java.lang.Throwable
java.lang.Exception
java.io.IOException
org.eclipse.jgit.notes.NotesMergeConflictException
All Implemented Interfaces:
Serializable

public class NotesMergeConflictException extends IOException
This exception will be thrown from the NoteMerger when a conflict on Notes content is found during merge.
See Also:
  • Field Details

  • Constructor Details

    • NotesMergeConflictException

      public NotesMergeConflictException(Note base, Note ours, Note theirs)
      Construct a NotesMergeConflictException for the specified base, ours and theirs note versions.
      Parameters:
      base - note version
      ours - note version
      theirs - note version
    • NotesMergeConflictException

      public NotesMergeConflictException(NonNoteEntry base, NonNoteEntry ours, NonNoteEntry theirs)
      Constructs a NotesMergeConflictException for the specified base, ours and theirs versions of the root note tree.
      Parameters:
      base - version of the root note tree
      ours - version of the root note tree
      theirs - version of the root note tree
  • Method Details