| Name |
Description |
| MergeStrategy |
A method of combining two or more trees together to form an output tree. Different strategies may employ different techniques for deciding which paths (and ObjectIds) to carry from the input trees into the final output tree. |
| Merger |
Instance of a specific MergeStrategy for a single Repository. |
| StrategySimpleTwoWayInCore |
Merges two commits together in-memory, ignoring any working directory. The strategy chooses a path from one of the two input trees if the path is unchanged in the other relative to their common merge base tree. This is a trivial 3-way merge (at the file path level only). Modifications of the same file path (content and/or file mode) by both input trees will cause a merge conflict, as this strategy does not attempt to merge file contents. |
| StrategySimpleTwoWayInCore.InCoreMerger |
|
| ThreeWayMergeStrategy |
A merge strategy to merge 2 trees, using a common base ancestor tree. |
| ThreeWayMerger |
A merge of 2 trees, using a common base ancestor tree. |