unison/unison-src/transcripts/update-on-conflict.md
2024-07-01 11:14:31 -07:00

335 B

Update on conflict

Updating conflicted definitions works fine.

scratch/main> builtins.merge lib.builtins
x = 1
temp = 2
scratch/main> add
scratch/main> debug.alias.term.force temp x
scratch/main> delete.term temp
x = 3
scratch/main> update
scratch/main> view x