Package org.eclipse.jgit.merge
package org.eclipse.jgit.merge
Content and commit history merge algorithms.
-
ClassDescriptionHow to handle content conflicts.An output stream which is aware of newlines and can be asked to begin a new line if not already in one.Provides the merge algorithm which does a three-way merge on content provided as RawText.One chunk from a merge result.A state telling whether a MergeChunk belongs to a conflict or not.Holds configuration for merging into a given branchA class to convert merge results into a Git conformant textual presentationFormatter for constructing the commit message for a merge commit.Instance of a specific
MergeStrategy
for a singleRepository
.MergeResult<S extends Sequence>The result of merging a number ofSequence
objects.A method of combining two or more trees together to form an output tree.A 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 baseA three-way merger performing a content-merge if necessaryIf the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failedFormatter for constructing the commit message for a squashed commit.Trivial merge strategy to make the resulting tree exactly match an input.A three-way merge strategy performing a content-merge if necessaryA three-way merge strategy performing a content-merge if necessaryMerges two commits together in-memory, ignoring any working directory.A merge of 2 trees, using a common base ancestor tree.A merge strategy to merge 2 trees, using a common base ancestor tree.