Top Description Constructors Methods
org.eclipse.jgit.merge

public Class StrategyResolve

extends ThreeWayMergeStrategy
Class Inheritance
Known Direct Subclasses
org.eclipse.jgit.merge.StrategyRecursive
Imports
org.eclipse.jgit.lib.Config, .ObjectInserter, .Repository
A three-way merge strategy performing a content-merge if necessary

Constructor Summary

AccessConstructor and Description
public
StrategyResolve()

Method Summary

Modifier and TypeMethod and Description
public String
getName()

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

Get default name of this strategy implementation.

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

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

Create a new merge instance.

public 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.ThreeWayMergeStrategy.newMerger.

Create a new merge instance.

public ThreeWayMerger
newMerger(ObjectInserter
inserter to write results back to.
inserter, Config
repo config for reading diff algorithm settings.
config)

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

Create a new merge instance.

Constructor Detail

StrategyResolveback to summary
public StrategyResolve()

Method Detail

getNameback to summary
public String getName()

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

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

Get default name of this strategy implementation.

Returns:String

default name of this strategy implementation.

Annotations
@Override
newMergerback to summary
public ThreeWayMerger newMerger(Repository db)

Implements abstract org.eclipse.jgit.merge.ThreeWayMergeStrategy.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 ThreeWayMerger newMerger(Repository db, boolean inCore)

Implements abstract org.eclipse.jgit.merge.ThreeWayMergeStrategy.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
newMergerback to summary
public ThreeWayMerger newMerger(ObjectInserter inserter, Config config)

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

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

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.

Parameters
inserter:ObjectInserter

inserter to write results back to.

config:Config

repo config for reading diff algorithm settings.

Returns:ThreeWayMerger

the new merge instance which implements this strategy.

Annotations
@Override