Package | Description |
---|---|
org.eclipse.jgit.api | |
org.eclipse.jgit.merge |
Modifier and Type | Method and Description |
---|---|
void |
MergeResult.addConflict(java.lang.String path,
MergeResult<?> lowLevelResult) |
Constructor and Description |
---|
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) |
Modifier and Type | Method and Description |
---|---|
<S extends Sequence> |
MergeAlgorithm.merge(SequenceComparator<S> cmp,
S base,
S ours,
S theirs)
Does the three way merge between a common base and two sequences.
|
Modifier and Type | Method and Description |
---|---|
java.util.Map<java.lang.String,MergeResult<? extends Sequence>> |
ResolveMerger.getMergeResults() |
Modifier and Type | Method and Description |
---|---|
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. |
Copyright © 2012. All Rights Reserved.