Package | Description |
---|---|
org.eclipse.jgit.api | |
org.eclipse.jgit.merge | |
org.eclipse.jgit.notes |
Class and Description |
---|
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
|
Class and Description |
---|
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.
|
Class and Description |
---|
MergeStrategy
A method of combining two or more trees together to form an output tree.
|
Copyright © 2012. All Rights Reserved.