Package org.eclipse.jgit.merge
Class StrategyResolve
java.lang.Object
org.eclipse.jgit.merge.MergeStrategy
org.eclipse.jgit.merge.ThreeWayMergeStrategy
org.eclipse.jgit.merge.StrategyResolve
- Direct Known Subclasses:
StrategyRecursive
A three-way merge strategy performing a content-merge if necessary
-
Field Summary
Fields inherited from class org.eclipse.jgit.merge.MergeStrategy
OURS, RECURSIVE, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptiongetName()
Get default name of this strategy implementation.newMerger
(ObjectInserter inserter, Config config) Create a new merge instance.newMerger
(Repository db) Create a new merge instance.newMerger
(Repository db, boolean inCore) Create a new merge instance.Methods inherited from class org.eclipse.jgit.merge.MergeStrategy
get, get, register, register
-
Constructor Details
-
StrategyResolve
public StrategyResolve()
-
-
Method Details
-
newMerger
Create a new merge instance.- Specified by:
newMerger
in classThreeWayMergeStrategy
- 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
Create a new merge instance.- Specified by:
newMerger
in classThreeWayMergeStrategy
- 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
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 classMergeStrategy
- 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.
-
getName
Get default name of this strategy implementation.- Specified by:
getName
in classMergeStrategy
- Returns:
- default name of this strategy implementation.
-