Class MergeDocumentResultScript


  • public class MergeDocumentResultScript
    extends Object
    Represents the result of a 3-way merge on documents performed in the MergeScriptService.
    Since:
    11.8RC1
    Version:
    $Id: 3a720ca68bc604073788f01332f9185c7c0a658a $
    • Method Detail

      • getPreviousDocument

        public Document getPreviousDocument()
        Returns:
        the previous document used for the merge.
      • getCurrentDocument

        public Document getCurrentDocument()
        Returns:
        the current document used for the merge.
      • getNextDocument

        public Document getNextDocument()
        Returns:
        the new document used for the merge.
      • getMergedDocument

        public Document getMergedDocument()
        Returns:
        the merged document obtained after the merge.
      • getContentConflicts

        public List<org.xwiki.diff.Conflict<?>> getContentConflicts()
        Returns:
        the conflicts that occurred when merging the content of document.
      • getAllConflicts

        public List<org.xwiki.diff.Conflict<Object>> getAllConflicts()
        Returns:
        all the conflicts that occurred when merging the whole document.