Example usage for Java org.eclipse.jgit.merge MergeStrategy fields, constructors, methods, implement or subclass
The text is from its open source code.
MergeStrategy | OURS Simple strategy that sets the output tree to the first input tree. |
MergeStrategy | THEIRS Simple strategy that sets the output tree to the second input tree. |
ThreeWayMergeStrategy | SIMPLE_TWO_WAY_IN_CORE Simple strategy to merge paths, without simultaneous edits. |
ThreeWayMergeStrategy | RESOLVE Simple strategy to merge paths. |
ThreeWayMergeStrategy | RECURSIVE Recursive strategy to merge paths. |
MergeStrategy | get(String name) Locate a strategy by name. |
String | getName() Get default name of this strategy implementation. |
Merger | newMerger(Repository db, boolean inCore) Create a new merge instance. |
Merger | newMerger(ObjectInserter inserter, Config config) Create a new merge instance. |
Merger | newMerger(Repository db) Create a new merge instance. |