Uses of Package
org.eclipse.jgit.merge
Packages that use org.eclipse.jgit.merge
Package
Description
High-level API commands (the porcelain of JGit).
Content and commit history merge algorithms.
Git notes processing (for commits, etc).
-
Classes in org.eclipse.jgit.merge used by org.eclipse.jgit.apiClassDescriptionHow to handle content conflicts.The result of merging a number of
Sequence
objects.A method of combining two or more trees together to form an output tree.If the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failed -
Classes in org.eclipse.jgit.merge used by org.eclipse.jgit.mergeClassDescriptionHow to handle content conflicts.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 branchInstance of a specific
MergeStrategy
for a singleRepository
.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 necessaryIf the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failedHandles work tree updates on both the checkout and the index.The result of writing the index changes.A three-way merge strategy performing a content-merge if necessaryA merge of 2 trees, using a common base ancestor tree.A merge strategy to merge 2 trees, using a common base ancestor tree. -
Classes in org.eclipse.jgit.merge used by org.eclipse.jgit.notesClassDescriptionA method of combining two or more trees together to form an output tree.