Package org.eclipse.jgit.merge


package org.eclipse.jgit.merge
Content and commit history merge algorithms.
  • Class
    Description
    How to handle content conflicts.
    Provides the merge algorithm which does a three-way merge on content provided as RawText.
    One chunk from a merge result.
    A state telling whether a MergeChunk belongs to a conflict or not.
    Holds configuration for merging into a given branch
    A class to convert merge results into a Git conformant textual presentation
    Formatter for constructing the commit message for a merge commit.
    Instance of a specific MergeStrategy for a single Repository.
    The result of merging a number of Sequence objects.
    A method of combining two or more trees together to form an output tree.
    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
    A three-way merger performing a content-merge if necessary
    If the merge fails (means: not stopped because of unresolved conflicts) this enum is used to explain why it failed
    Handles work tree updates on both the checkout and the index.
    The result of writing the index changes.
    Formatter for constructing the commit message for a squashed commit.
    Trivial merge strategy to make the resulting tree exactly match an input.
    A three-way merge strategy performing a content-merge if necessary
    A three-way merge strategy performing a content-merge if necessary
    Merges two commits together in-memory, ignoring any working directory.
    A merge of 2 trees, using a common base ancestor tree.
    A merge strategy to merge 2 trees, using a common base ancestor tree.