Expand description
State machine of a conflict-resolution session (pure logic; touches neither the terminal nor git).
The model mirrors the frontend semantics of the toolkit-rs web version:
each side of a change chunk is in one of three states (pending / applied /
ignored), applied content is appended in take order (taking both sides of a
conflict one after another means “keep both”), and editing via $EDITOR
overrides the whole chunk.
Structs§
- Chunk
State - 单个块的解决状态。
- File
Merge - 一个文本文件的合并会话:块列表 + 各块解决状态 + 光标。
- Session
- 多文件冲突解决会话。