feat: Implement DAG-based conflict resolution with binary keys and multi-head CLI display

Browse Source

...

This commit is contained in:

nils

2025-12-22 01:56:26 +01:00

parent 346ebccee7

commit 57c2906b10

10 changed files with 950 additions and 240 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

lattice-core/src/store.rs

+797 -190

File diff suppressed because it is too large Load Diff