Expand description
Workspace merge with fast-path and rebase strategies.
When the repository HEAD still equals the workspace’s base commit, a
fast-forward merge applies the overlay directly via
commit_tree_overlay. When HEAD has advanced, a rebase path checks
each modified file for semantic conflicts and auto-merges where
possible.
Enums§
- Workspace
Merge Result - Outcome of attempting to merge a workspace into the repository.
Functions§
- merge_
workspace - Attempt to merge a workspace’s overlay into the repository.