Uses of Package
org.eclipse.jgit.merge

Packages that use org.eclipse.jgit.merge

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

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.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

MergeChunk
One chunk from a merge result.

MergeChunk.ConflictState
A state telling whether a MergeChunk belongs to a conflict or not.

Merger
Instance of a specific MergeStrategy for a single Repository.

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.MergeFailureReason
If the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failed

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.

Classes in org.eclipse.jgit.merge used by org.eclipse.jgit.notes

MergeStrategy
A method of combining two or more trees together to form an output tree.