|
||||||||||
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
public abstract class ThreeWayMergeStrategy
A merge strategy to merge 2 trees, using a common base ancestor tree.
Field Summary |
---|
Fields inherited from class org.eclipse.jgit.merge.MergeStrategy |
---|
OURS, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS |
Constructor Summary | |
---|---|
ThreeWayMergeStrategy()
|
Method Summary | |
---|---|
abstract ThreeWayMerger |
newMerger(Repository db)
Create a new merge instance. |
abstract ThreeWayMerger |
newMerger(Repository db,
boolean inCore)
Create a new merge instance. |
Methods inherited from class org.eclipse.jgit.merge.MergeStrategy |
---|
get, get, getName, register, register |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public ThreeWayMergeStrategy()
Method Detail |
---|
public abstract ThreeWayMerger newMerger(Repository db)
MergeStrategy
newMerger
in class MergeStrategy
db
- repository database the merger will read from, and eventually
write results back to.
public abstract ThreeWayMerger newMerger(Repository db, boolean inCore)
MergeStrategy
newMerger
in class MergeStrategy
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.
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |