Module tree

Expand description

Modules§

Conflict: A description of a conflict (i.e. merge issue without an auto-resolution) as seen during a tree-merge. They may have a resolution that was applied automatically, or be left for the caller to resolved.
ConflictIndexEntry: A conflicting entry for insertion into the index. It will always be either on stage 1 (ancestor/base), 2 (ours) or 3 (theirs)
ContentMerge: Information about a blob content merge for use in a Resolution. Note that content merges always count as success to avoid duplication of cases, which forces callers to check for the resolution field.
Options: A way to configure tree().
Outcome: The outcome produced by tree().
TreatAsUnresolved: Determine what should be considered an unresolved conflict.

Error: The error returned by tree().
Resolution: Describes of a conflict involving our change and their change was specifically resolved.
ResolutionFailure: Describes of a conflict involving our change and their failed to be resolved.
ResolveWith: Decide how to resolve tree-related conflicts, but only those that have no way of being correct.

apply_index_entries: Returns true if index changed as we applied conflicting stages to it, using how to determine if a conflict should be considered unresolved. Once a stage of a path conflicts, the unconflicting stage is removed even though it might be the one that is currently checked out. This removal is only done by flagging it with gix_index::entry::Flags::REMOVE, which means these entries won’t be written back to disk but will still be present in the index if removal_mode is RemovalMode::Mark. For proper removal, choose RemovalMode::Prune. It’s important that index matches the tree that was produced as part of the merge that also brought about conflicts, or else this function will fail if it cannot find the path matching the conflicting entries.