Top Description Classes Enums

module org.eclipse.jgit

Package org.eclipse.jgit.merge

Content and commit history merge algorithms.

Class Summary

Modifier and Type	Class and Description
pack-priv class	EolAwareOutputStream An output stream which is aware of newlines and can be asked to begin a new line if not already in one.
public class	MergeAlgorithm Provides the merge algorithm which does a three-way merge on content provided as RawText.
public class	MergeChunk One chunk from a merge result.
public class	MergeConfig Holds configuration for merging into a given branch
public class	MergeFormatter A class to convert merge results into a Git conformant textual presentation
pack-priv class	MergeFormatterPass
public class	MergeMessageFormatter Formatter for constructing the commit message for a merge commit.
public abstract class	Merger Instance of a specific `org.eclipse.jgit.merge.MergeStrategy` for a single `org.eclipse.jgit.lib.Repository`.
public class	MergeResult< type of sequence. S extends Sequence> The result of merging a number of `org.eclipse.jgit.diff.Sequence` objects.
public abstract class	MergeStrategy A method of combining two or more trees together to form an output tree.
public class	RecursiveMerger A three-way merger performing a content-merge if necessary across multiple bases using recursion This merger extends the resolve merger and does several things differently: - allow more than one merge base, up to a maximum - uses "Lists" instead of Arrays for chained types - recursively merges the merge bases together to compute a usable base
public class	ResolveMerger A three-way merger performing a content-merge if necessary
public class	SquashMessageFormatter Formatter for constructing the commit message for a squashed commit.
public class	StrategyOneSided Trivial merge strategy to make the resulting tree exactly match an input.
public class	StrategyRecursive A three-way merge strategy performing a content-merge if necessary
public class	StrategyResolve A three-way merge strategy performing a content-merge if necessary
public class	StrategySimpleTwoWayInCore Merges two commits together in-memory, ignoring any working directory.
public abstract class	ThreeWayMerger A merge of 2 trees, using a common base ancestor tree.
public abstract class	ThreeWayMergeStrategy A merge strategy to merge 2 trees, using a common base ancestor tree.

Enum Summary

Modifier and Type	Enum and Description
public enum	ContentMergeStrategy How to handle content conflicts.