Class StrategyRecursive


  • public class StrategyRecursive
    extends StrategyResolve
    A three-way merge strategy performing a content-merge if necessary
    Since:
    3.0
    • Constructor Detail

      • StrategyRecursive

        public StrategyRecursive()
    • Method Detail

      • newMerger

        public ThreeWayMerger newMerger​(Repository db)
        Create a new merge instance.
        Overrides:
        newMerger in class StrategyResolve
        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 ThreeWayMerger newMerger​(Repository db,
                                        boolean inCore)
        Create a new merge instance.
        Overrides:
        newMerger in class StrategyResolve
        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.
      • newMerger

        public ThreeWayMerger newMerger​(ObjectInserter inserter,
                                        Config config)
        Create a new merge instance.

        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.

        Overrides:
        newMerger in class StrategyResolve
        Parameters:
        inserter - inserter to write results back to.
        config - repo config for reading diff algorithm settings.
        Returns:
        the new merge instance which implements this strategy.
      • getName

        public String getName()
        Get default name of this strategy implementation.
        Overrides:
        getName in class StrategyResolve
        Returns:
        default name of this strategy implementation.