The earlier 'git checkout --theirs' resolution of the register merge conflict
took main's whole file, which reverted two branch-only changes: IA-15 (re-added
in
|
||
|---|---|---|
| .. | ||
| acdream-architecture.md | ||
| code-structure.md | ||
| retail-divergence-register.md | ||
| worldbuilder-inventory.md | ||