Uses of Class
org.eclipse.jgit.merge.MergeResult
Packages that use MergeResult
Package
Description
High-level API commands (the porcelain of JGit).
Content and commit history merge algorithms.
-
Uses of MergeResult in org.eclipse.jgit.api
Methods in org.eclipse.jgit.api with parameters of type MergeResultModifier and TypeMethodDescriptionvoidMergeResult.addConflict(String path, MergeResult<?> lowLevelResult) Add a conflictConstructor parameters in org.eclipse.jgit.api with type arguments of type MergeResultModifierConstructorDescriptionMergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults) Constructor for MergeResult.MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, String description) Constructor for MergeResult.MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, Map<String, ResolveMerger.MergeFailureReason> failingPaths, String description) Constructor for MergeResult. -
Uses of MergeResult in org.eclipse.jgit.merge
Fields in org.eclipse.jgit.merge declared as MergeResultFields in org.eclipse.jgit.merge with type parameters of type MergeResultModifier and TypeFieldDescriptionprotected Map<String,MergeResult<? extends Sequence>> ResolveMerger.mergeResultsLow-level textual merge results.Methods in org.eclipse.jgit.merge that return MergeResultModifier and TypeMethodDescriptionprivate MergeResult<RawText>ResolveMerger.contentMerge(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, Attributes[] attributes, ContentMergeStrategy strategy) 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 MergeResultModifier and TypeMethodDescriptionMap<String,MergeResult<? extends Sequence>> ResolveMerger.getMergeResults()Get the mergeResultsMethods in org.eclipse.jgit.merge with parameters of type MergeResultModifier and TypeMethodDescriptionprivate TemporaryBufferResolveMerger.doMerge(MergeResult<RawText> result) voidMergeFormatter.formatMerge(OutputStream out, MergeResult<RawText> res, List<String> seqName, String charsetName) Deprecated.voidMergeFormatter.formatMerge(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset) Formats the results of a merge ofRawTextobjects in a Git conformant way.voidMergeFormatter.formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, String charsetName) Deprecated.voidMergeFormatter.formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, Charset charset) Formats the results of a merge of exactly twoRawTextobjects in a Git conformant way.private voidResolveMerger.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 MergeResultModifierConstructorDescription(package private)MergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName, Charset charset)
MergeFormatter.formatMerge(OutputStream, MergeResult, List, Charset)instead.