| ContentMergeStrategy |
How to handle content conflicts.
|
| MergeAlgorithm |
Provides the merge algorithm which does a three-way merge on content provided
as RawText.
|
| MergeChunk |
One chunk from a merge result.
|
| MergeChunk.ConflictState |
A state telling whether a MergeChunk belongs to a conflict or not.
|
| MergeConfig |
Holds configuration for merging into a given branch
|
| Merger |
|
| MergeResult |
The result of merging a number of Sequence
objects. |
| MergeStrategy |
A method of combining two or more trees together to form an output tree.
|
| ResolveMerger |
A three-way merger performing a content-merge if necessary
|
| ResolveMerger.MergeFailureReason |
If the merge fails (means: not stopped because of unresolved conflicts)
this enum is used to explain why it failed
|
| ResolveMerger.WorkTreeUpdater |
Handles work tree updates on both the checkout and the index.
|
| ResolveMerger.WorkTreeUpdater.Result |
The result of writing the index changes.
|
| StrategyResolve |
A three-way merge strategy performing a content-merge if necessary
|
| ThreeWayMerger |
A merge of 2 trees, using a common base ancestor tree.
|
| ThreeWayMergeStrategy |
A merge strategy to merge 2 trees, using a common base ancestor tree.
|