Skip to main content

Module merge

Module merge 

Source
Expand description

Merge operations for void repositories.

This module implements merge operations including:

  • Fast-forward merge for linear history
  • Three-way merge with conflict detection
  • Merge state management (continue/abort)

Structs§

ConflictInfo
Information about a file conflict.
MergeOptions
Options for merge operation.

Enums§

ConflictType
Type of merge conflict.
MergeResult
Merge outcome.

Functions§

merge
Perform a merge operation.
merge_abort
Abort an in-progress merge.
merge_continue
Continue a merge after conflicts have been resolved.
merge_fast_forward
Fast-forward merge: update HEAD to target commit if it is a descendant.