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 TypeClassDescriptionclassA three-way merge strategy performing a content-merge if necessaryclassA three-way merge strategy performing a content-merge if necessaryclassMerges two commits together in-memory, ignoring any working directory.Fields in org.eclipse.jgit.merge declared as ThreeWayMergeStrategyModifier and TypeFieldDescriptionstatic final ThreeWayMergeStrategyMergeStrategy.RECURSIVERecursive strategy to merge paths.static final ThreeWayMergeStrategyMergeStrategy.RESOLVESimple strategy to merge paths.static final ThreeWayMergeStrategyMergeStrategy.SIMPLE_TWO_WAY_IN_CORESimple strategy to merge paths, without simultaneous edits.