org.eclipse.jgit.merge
Class StrategyResolve
java.lang.Object
org.eclipse.jgit.merge.MergeStrategy
org.eclipse.jgit.merge.ThreeWayMergeStrategy
org.eclipse.jgit.merge.StrategyResolve
public class StrategyResolve
- extends ThreeWayMergeStrategy
A three-way merge strategy performing a content-merge if necessary
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
StrategyResolve
public StrategyResolve()
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.
getName
public String getName()
- Specified by:
getName
in class MergeStrategy
- Returns:
- default name of this strategy implementation.
Copyright © 2013. All Rights Reserved.