Package | Description |
---|---|
org.eclipse.jgit.api |
High-level API commands (the porcelain of JGit).
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method and Description |
---|---|
void |
MergeResult.addConflict(java.lang.String path,
MergeResult<?> lowLevelResult)
Add a conflict
|
Constructor and Description |
---|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults)
Constructor for MergeResult.
|
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)
Constructor for MergeResult.
|
MergeResult(ObjectId newHead,
ObjectId base,
ObjectId[] mergedCommits,
MergeResult.MergeStatus mergeStatus,
MergeStrategy mergeStrategy,
java.util.Map<java.lang.String,MergeResult<?>> lowLevelResults,
java.lang.String description)
Constructor for MergeResult.
|
Modifier and Type | Field and Description |
---|---|
private MergeResult<RawText> |
MergeFormatterPass.res |
Modifier and Type | Field and Description |
---|---|
protected java.util.Map<java.lang.String,MergeResult<? extends Sequence>> |
ResolveMerger.mergeResults
Low-level textual merge results.
|
Modifier and Type | Method and Description |
---|---|
private MergeResult<RawText> |
ResolveMerger.contentMerge(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
Attributes attributes)
Does the content merge.
|
<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()
Get the mergeResults
|
Modifier and Type | Method and Description |
---|---|
private TemporaryBuffer |
ResolveMerger.doMerge(MergeResult<RawText> result) |
void |
MergeFormatter.formatMerge(java.io.OutputStream out,
MergeResult<RawText> res,
java.util.List<java.lang.String> seqName,
java.nio.charset.Charset charset)
Formats the results of a merge of
RawText
objects in a Git conformant way. |
void |
MergeFormatter.formatMerge(java.io.OutputStream out,
MergeResult<RawText> res,
java.util.List<java.lang.String> seqName,
java.lang.String charsetName)
Deprecated.
|
void |
MergeFormatter.formatMerge(java.io.OutputStream out,
MergeResult res,
java.lang.String baseName,
java.lang.String oursName,
java.lang.String theirsName,
java.nio.charset.Charset charset)
Formats the results of a merge of exactly two
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)
Deprecated.
|
private void |
ResolveMerger.updateIndex(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
MergeResult<RawText> result,
Attributes attributes)
Updates the index after a content merge has happened.
|
Constructor and Description |
---|
MergeFormatterPass(java.io.OutputStream out,
MergeResult<RawText> res,
java.util.List<java.lang.String> seqName,
java.nio.charset.Charset charset) |