Uses of Class
org.eclipse.jgit.merge.ThreeWayMergeStrategy
Packages that use ThreeWayMergeStrategy
-
Uses of ThreeWayMergeStrategy in org.eclipse.jgit.merge
Subclasses of ThreeWayMergeStrategy in org.eclipse.jgit.mergeModifier and TypeClassDescriptionclass
A three-way merge strategy performing a content-merge if necessaryclass
A three-way merge strategy performing a content-merge if necessaryclass
Merges two commits together in-memory, ignoring any working directory.Fields in org.eclipse.jgit.merge declared as ThreeWayMergeStrategyModifier and TypeFieldDescriptionstatic final ThreeWayMergeStrategy
MergeStrategy.RECURSIVE
Recursive strategy to merge paths.static final ThreeWayMergeStrategy
MergeStrategy.RESOLVE
Simple strategy to merge paths.static final ThreeWayMergeStrategy
MergeStrategy.SIMPLE_TWO_WAY_IN_CORE
Simple strategy to merge paths, without simultaneous edits.