|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectorg.eclipse.jgit.merge.MergeStrategy
org.eclipse.jgit.merge.ThreeWayMergeStrategy
org.eclipse.jgit.merge.StrategyResolve
public class StrategyResolve
A three-way merge strategy performing a content-merge if necessary
Field Summary |
---|
Fields inherited from class org.eclipse.jgit.merge.MergeStrategy |
---|
OURS, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS |
Constructor Summary | |
---|---|
StrategyResolve()
|
Method Summary | |
---|---|
java.lang.String |
getName()
|
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 |
---|
public StrategyResolve()
Method Detail |
---|
public ThreeWayMerger newMerger(Repository db)
MergeStrategy
newMerger
in class ThreeWayMergeStrategy
db
- repository database the merger will read from, and eventually
write results back to.
public ThreeWayMerger newMerger(Repository db, boolean inCore)
MergeStrategy
newMerger
in class ThreeWayMergeStrategy
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.
public java.lang.String getName()
getName
in class MergeStrategy
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |