Top Description Fields Constructors Methods
org.eclipse.jgit.merge

public abstract Class ThreeWayMergeStrategy

extends MergeStrategy
Class Inheritance
Known Direct Subclasses
org.eclipse.jgit.merge.StrategyResolve, org.eclipse.jgit.merge.StrategySimpleTwoWayInCore
Imports
org.eclipse.jgit.lib.Repository
A merge strategy to merge 2 trees, using a common base ancestor tree.

Field Summary

Inherited from org.eclipse.jgit.merge.MergeStrategy:
OURSRECURSIVERESOLVESIMPLE_TWO_WAY_IN_CORETHEIRS

Constructor Summary

AccessConstructor and Description
public
ThreeWayMergeStrategy()

Method Summary

Modifier and TypeMethod and Description
public abstract ThreeWayMerger
newMerger(Repository
repository database the merger will read from, and eventually write results back to.
db)

Implements abstract org.eclipse.jgit.merge.MergeStrategy.newMerger.

Create a new merge instance.

public abstract ThreeWayMerger
newMerger(Repository
repository database the merger will read from, and eventually write results back to.
db, boolean
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.
inCore)

Implements abstract org.eclipse.jgit.merge.MergeStrategy.newMerger.

Create a new merge instance.

Inherited from org.eclipse.jgit.merge.MergeStrategy:
getgetgetNamenewMergerregisterregister

Constructor Detail

ThreeWayMergeStrategyback to summary
public ThreeWayMergeStrategy()

Method Detail

newMergerback to summary
public abstract ThreeWayMerger newMerger(Repository db)

Implements abstract org.eclipse.jgit.merge.MergeStrategy.newMerger.

Doc from org.eclipse.jgit.merge.MergeStrategy.newMerger.

Create a new merge instance.

Parameters
db:Repository

repository database the merger will read from, and eventually write results back to.

Returns:ThreeWayMerger

the new merge instance which implements this strategy.

Annotations
@Override
newMergerback to summary
public abstract ThreeWayMerger newMerger(Repository db, boolean inCore)

Implements abstract org.eclipse.jgit.merge.MergeStrategy.newMerger.

Doc from org.eclipse.jgit.merge.MergeStrategy.newMerger.

Create a new merge instance.

Parameters
db:Repository

repository database the merger will read from, and eventually write results back to.

inCore:boolean

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:ThreeWayMerger

the new merge instance which implements this strategy.

Annotations
@Override