Uses of Class
org.eclipse.jgit.merge.MergeResult

Packages that use MergeResult

Package	Description
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

Modifier and Type	Method	Description
void	MergeResult.addConflict(java.lang.String path, MergeResult<?> lowLevelResult)	Add a conflict

Constructor parameters in org.eclipse.jgit.api with type arguments of type MergeResult

Constructor	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.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.util.Map<java.lang.String,ResolveMerger.MergeFailureReason> failingPaths, java.lang.String description)	Constructor for MergeResult.

Uses of MergeResult in org.eclipse.jgit.merge

Fields in org.eclipse.jgit.merge declared as MergeResult

Modifier and Type	Field	Description
private MergeResult<RawText>	MergeFormatterPass.res

Fields in org.eclipse.jgit.merge with type parameters of type MergeResult

Modifier and Type	Field	Description
protected java.util.Map<java.lang.String,MergeResult<? extends Sequence>>	ResolveMerger.mergeResults	Low-level textual merge results.

Methods in org.eclipse.jgit.merge that return MergeResult

Modifier and Type	Method	Description
private MergeResult<RawText>	ResolveMerger.contentMerge(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, Attributes attributes)	Does the content merge.
private static MergeResult<SubmoduleConflict>	ResolveMerger.createGitLinksMergeResult(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs)
<S extends Sequence> MergeResult<S>	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

Modifier and Type	Method	Description
java.util.Map<java.lang.String,MergeResult<? extends Sequence>>	ResolveMerger.getMergeResults()	Get the mergeResults

Methods in org.eclipse.jgit.merge with parameters of type MergeResult

Modifier and Type	Method	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.lang.String charsetName)	Deprecated. Use MergeFormatter.formatMerge(OutputStream, MergeResult, List, Charset) instead.
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 res, java.lang.String baseName, java.lang.String oursName, java.lang.String theirsName, java.lang.String charsetName)	Deprecated. use MergeFormatter.formatMerge(OutputStream, MergeResult, String, String, String, Charset) instead.
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.
private void	ResolveMerger.updateIndex(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, MergeResult<RawText> result, Attributes attributes)	Updates the index after a content merge has happened.

Constructors in org.eclipse.jgit.merge with parameters of type MergeResult

Constructor	Description
MergeFormatterPass(java.io.OutputStream out, MergeResult<RawText> res, java.util.List<java.lang.String> seqName, java.nio.charset.Charset charset)