org.eclipse.jgit.merge

Class StrategySimpleTwoWayInCore

java.lang.Object

org.eclipse.jgit.merge.MergeStrategy

org.eclipse.jgit.merge.ThreeWayMergeStrategy

org.eclipse.jgit.merge.StrategySimpleTwoWayInCore

public class StrategySimpleTwoWayInCore
extends ThreeWayMergeStrategy

Merges two commits together in-memory, ignoring any working directory.

The strategy chooses a path from one of the two input trees if the path is unchanged in the other relative to their common merge base tree. This is a trivial 3-way merge (at the file path level only).

Modifications of the same file path (content and/or file mode) by both input trees will cause a merge conflict, as this strategy does not attempt to merge file contents.

Field Summary

Fields inherited from class org.eclipse.jgit.merge.MergeStrategy

OURS, RECURSIVE, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS

Constructor Summary

Constructors

Modifier	Constructor and Description
protected	StrategySimpleTwoWayInCore() Create a new instance of the strategy.

Method Summary

Modifier and Type	Method and Description
String	getName()
ThreeWayMerger	newMerger(ObjectInserter inserter, Config config) Create a new merge instance.
ThreeWayMerger	newMerger(Repository db) Create a new merge instance.
ThreeWayMerger	newMerger(Repository db, boolean inCore) Create a new merge instance.

Methods inherited from class org.eclipse.jgit.merge.MergeStrategy

get, get, register, register

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

StrategySimpleTwoWayInCore

protected StrategySimpleTwoWayInCore()

Create a new instance of the strategy.

Method Detail

getName

public String getName()

Specified by:

getName in class MergeStrategy

Returns:

default name of this strategy implementation.

newMerger

public ThreeWayMerger newMerger(Repository db)

Description copied from class: MergeStrategy

Create a new merge instance.

Specified by:

newMerger in class ThreeWayMergeStrategy

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 ThreeWayMerger newMerger(Repository db,
                                boolean inCore)

Description copied from class: MergeStrategy

Create a new merge instance.

Specified by:

newMerger in class ThreeWayMergeStrategy

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.

newMerger

public ThreeWayMerger newMerger(ObjectInserter inserter,
                                Config config)

Description copied from class: MergeStrategy

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.

Specified by:

newMerger in class MergeStrategy

Parameters:

inserter - inserter to write results back to.

config - repo config for reading diff algorithm settings.

Returns:

the new merge instance which implements this strategy.

Since:

4.8