Content and commit history merge algorithms.
Class Summary Class Description MergeAlgorithmProvides the merge algorithm which does a three-way merge on content provided as RawText. MergeChunkOne chunk from a merge result. MergeConfigHolds configuration for merging into a given branch MergeFormatterA class to convert merge results into a Git conformant textual presentation MergeMessageFormatterFormatter for constructing the commit message for a merge commit. Merger MergeResult<S extends Sequence>The result of merging a number of
MergeStrategyA method of combining two or more trees together to form an output tree. RecursiveMergerA three-way merger performing a content-merge if necessary across multiple bases using recursion This merger extends the resolve merger and does several things differently: - allow more than one merge base, up to a maximum - uses "Lists" instead of Arrays for chained types - recursively merges the merge bases together to compute a usable base ResolveMergerA three-way merger performing a content-merge if necessary SquashMessageFormatterFormatter for constructing the commit message for a squashed commit. StrategyOneSidedTrivial merge strategy to make the resulting tree exactly match an input. StrategyRecursiveA three-way merge strategy performing a content-merge if necessary StrategyResolveA three-way merge strategy performing a content-merge if necessary StrategySimpleTwoWayInCoreMerges two commits together in-memory, ignoring any working directory. ThreeWayMergerA merge of 2 trees, using a common base ancestor tree. ThreeWayMergeStrategyA merge strategy to merge 2 trees, using a common base ancestor tree.
Enum Summary Enum Description ContentMergeStrategyHow to handle content conflicts. MergeChunk.ConflictStateA state telling whether a MergeChunk belongs to a conflict or not. ResolveMerger.MergeFailureReasonIf the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failed