Class MergeConflictingRunnable

    • Constructor Detail

      • MergeConflictingRunnable

        public MergeConflictingRunnable​(boolean isLeftEditable,
                                        boolean isRightEditable,
                                        MergeMode mergeMode,
                                        IDiffRelationshipComputer diffRelationshipComputer)
        Default constructor.
        Parameters:
        isLeftEditable - Whether the left side of the comparison we're operating on is editable.
        isRightEditable - Whether the right side of the comparison we're operating on is editable.
        mergeMode - Merge mode for this operation.
        diffRelationshipComputer - The diff relationship computer used to find resulting merges and rejections.
    • Method Detail

      • merge

        public void merge​(List<? extends Diff> differences,
                          boolean leftToRight,
                          IMerger.Registry mergerRegistry)
        Execute the merge operation.
        Specified by:
        merge in interface IMergeRunnable
        Parameters:
        differences - the differences to merge.
        leftToRight - whether the differences have to be merge from left to right or right to left.
        mergerRegistry - the merger registry to query to get the appropriate mergers for each difference to be merged.