Class ThreeWayMergeStrategy

java.lang.Object
org.eclipse.jgit.merge.MergeStrategy
org.eclipse.jgit.merge.ThreeWayMergeStrategy
Direct Known Subclasses:
StrategyResolve, StrategySimpleTwoWayInCore

public abstract class ThreeWayMergeStrategy extends MergeStrategy
A merge strategy to merge 2 trees, using a common base ancestor tree.
  • Constructor Details

    • ThreeWayMergeStrategy

      public ThreeWayMergeStrategy()
  • Method Details

    • 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.