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(String path, MergeResult<?> lowLevelResult)
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, Map<String,MergeResult<?>> lowLevelResults)
MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String,MergeResult<?>> lowLevelResults, String description)
MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String,MergeResult<?>> lowLevelResults, Map<String,ResolveMerger.MergeFailureReason> failingPaths, String description)
-
Uses of MergeResult in org.eclipse.jgit.merge
Fields in org.eclipse.jgit.merge with type parameters of type MergeResult Modifier and Type Field Description protected Map<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 <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 Map<String,MergeResult<? extends Sequence>>
ResolveMerger. getMergeResults()
Methods in org.eclipse.jgit.merge with parameters of type MergeResult Modifier and Type Method Description void
MergeFormatter. formatMerge(OutputStream out, MergeResult<RawText> res, List<String> seqName, String charsetName)
Formats the results of a merge ofRawText
objects in a Git conformant way.void
MergeFormatter. formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, String charsetName)
Formats the results of a merge of exactly twoRawText
objects in a Git conformant way.
-