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§
- Conflict
Info - Information about a file conflict.
- Merge
Options - Options for merge operation.
Enums§
- Conflict
Type - Type of merge conflict.
- Merge
Result - 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.