Uses of Package
org.eclipse.jgit.merge
-
Packages that use org.eclipse.jgit.merge Package Description org.eclipse.jgit.api High-level API commands (the porcelain of JGit).org.eclipse.jgit.merge Content and commit history merge algorithms.org.eclipse.jgit.notes Git notes processing (for commits, etc). -
Classes in org.eclipse.jgit.merge used by org.eclipse.jgit.api Class Description ContentMergeStrategy How to handle content conflicts.MergeResult The result of merging a number ofSequence
objects.MergeStrategy A method of combining two or more trees together to form an output tree.ResolveMerger.MergeFailureReason 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.merge Class Description 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 branchMerger Instance of a specificMergeStrategy
for a singleRepository
.MergeResult The result of merging a number ofSequence
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 necessaryResolveMerger.MergeFailureReason If the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failedStrategyResolve A three-way merge strategy performing a content-merge if necessaryThreeWayMerger 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. -
Classes in org.eclipse.jgit.merge used by org.eclipse.jgit.notes Class Description MergeStrategy A method of combining two or more trees together to form an output tree.