|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use MergeResult | |
---|---|
org.eclipse.jgit.api | High-level API commands (the porcelain of JGit). |
org.eclipse.jgit.merge | Content and commit history merge algorithms. |
Uses of MergeResult in org.eclipse.jgit.api |
---|
Methods in org.eclipse.jgit.api with parameters of type MergeResult | |
---|---|
void |
MergeResult.addConflict(java.lang.String path,
MergeResult<?> lowLevelResult)
|
Constructor parameters in org.eclipse.jgit.api with type arguments of type MergeResult | |
---|---|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults)
|
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> failingPaths,
java.lang.String description)
|
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.lang.String description)
|
Uses of MergeResult in org.eclipse.jgit.merge |
---|
Methods in org.eclipse.jgit.merge that return MergeResult | ||
---|---|---|
|
MergeAlgorithm.merge(SequenceComparator<S> cmp,
S base,
S ours,
S theirs)
Does the three way merge between a common base and two sequences. |
Methods in org.eclipse.jgit.merge that return types with arguments of type MergeResult | |
---|---|
java.util.Map<java.lang.String,MergeResult<? extends Sequence>> |
ResolveMerger.getMergeResults()
|
Methods in org.eclipse.jgit.merge with parameters of type MergeResult | |
---|---|
void |
MergeFormatter.formatMerge(java.io.OutputStream out,
MergeResult<RawText> res,
java.util.List<java.lang.String> seqName,
java.lang.String charsetName)
Formats the results of a merge of RawText objects in a Git
conformant way. |
void |
MergeFormatter.formatMerge(java.io.OutputStream out,
MergeResult res,
java.lang.String baseName,
java.lang.String oursName,
java.lang.String theirsName,
java.lang.String charsetName)
Formats the results of a merge of exactly two RawText objects in
a Git conformant way. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |