Class ThreeWayMergeStrategy

    • Constructor Detail

      • ThreeWayMergeStrategy

        public ThreeWayMergeStrategy()
    • Method Detail

      • newMerger

        public abstract ThreeWayMerger newMerger​(Repository db)
        Create a new merge instance.
        Specified by:
        newMerger in class MergeStrategy
        Parameters:
        db - repository database the merger will read from, and eventually write results back to.
        Returns:
        the new merge instance which implements this strategy.
      • newMerger

        public abstract ThreeWayMerger newMerger​(Repository db,
                                                 boolean inCore)
        Create a new merge instance.
        Specified by:
        newMerger in class MergeStrategy
        Parameters:
        db - repository database the merger will read from, and eventually write results back to.
        inCore - the merge will happen in memory, working folder will not be modified, in case of a non-trivial merge that requires manual resolution, the merger will fail.
        Returns:
        the new merge instance which implements this strategy.