Class StrategyOneSided.OneSide

    • Field Detail

      • treeIndex

        private final int treeIndex
    • Constructor Detail

      • OneSide

        protected OneSide​(Repository local,
                          int index)
    • Method Detail

      • mergeImpl

        protected boolean mergeImpl()
                             throws java.io.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:
        IncorrectObjectTypeException - one of the input objects is not a commit, but the strategy requires it to be a commit.
        java.io.IOException - one or more sources could not be read, or outputs could not be written to the Repository.
      • 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