Class StrategyOneSided.OneSide

java.lang.Object
org.eclipse.jgit.merge.Merger
org.eclipse.jgit.merge.StrategyOneSided.OneSide
Enclosing class:
StrategyOneSided

static class StrategyOneSided.OneSide extends Merger
  • Field Details

    • treeIndex

      private final int treeIndex
  • Constructor Details

    • OneSide

      protected OneSide(Repository local, int index)
    • OneSide

      protected OneSide(ObjectInserter inserter, int index)
  • Method Details

    • mergeImpl

      protected boolean mergeImpl() throws IOException
      Description copied from class: Merger
      Execute the merge.

      This method is called from Merger.merge(AnyObjectId[]) after the Merger.sourceObjects, Merger.sourceCommits and Merger.sourceTrees have been populated.

      Specified by:
      mergeImpl in class Merger
      Returns:
      true if the merge was completed without conflicts; false if the merge strategy cannot handle this merge or there were conflicts preventing it from automatically resolving all paths.
      Throws:
      IOException - one or more sources could not be read, or outputs could not be written to the Repository.
    • getResultTreeId

      public ObjectId getResultTreeId()
      Description copied from class: Merger
      Get resulting tree.
      Specified by:
      getResultTreeId in class Merger
      Returns:
      resulting tree, if Merger.merge(AnyObjectId[]) returned true.
    • getBaseCommitId

      public ObjectId getBaseCommitId()
      Description copied from class: Merger
      Get the ID of the commit that was used as merge base for merging
      Specified by:
      getBaseCommitId in class Merger
      Returns:
      the ID of the commit that was used as merge base for merging, or null if no merge base was used or it was set manually