2022-01-17 03:25:50 +03:00
|
|
|
# Update on conflict
|
|
|
|
|
2024-07-23 20:45:16 +03:00
|
|
|
Conflicted definitions prevent `update` from succeeding.
|
2024-06-27 18:44:46 +03:00
|
|
|
|
2024-07-10 17:46:18 +03:00
|
|
|
``` unison
|
2024-06-27 18:44:46 +03:00
|
|
|
x = 1
|
|
|
|
temp = 2
|
2022-01-17 03:25:50 +03:00
|
|
|
```
|
|
|
|
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2023-12-22 14:55:24 +03:00
|
|
|
Loading changes detected in scratch.u.
|
|
|
|
|
2022-01-17 03:25:50 +03:00
|
|
|
I found and typechecked these definitions in scratch.u. If you
|
|
|
|
do an `add` or `update`, here's how your codebase would
|
|
|
|
change:
|
|
|
|
|
|
|
|
⍟ These new definitions are ok to `add`:
|
|
|
|
|
2024-06-27 18:44:46 +03:00
|
|
|
temp : Nat
|
|
|
|
x : Nat
|
2022-01-17 03:25:50 +03:00
|
|
|
|
|
|
|
```
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2024-07-01 20:28:52 +03:00
|
|
|
scratch/main> add
|
2022-01-17 03:25:50 +03:00
|
|
|
|
|
|
|
⍟ I've added these definitions:
|
|
|
|
|
2024-06-27 18:44:46 +03:00
|
|
|
temp : Nat
|
|
|
|
x : Nat
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2024-07-01 20:28:52 +03:00
|
|
|
scratch/main> debug.alias.term.force temp x
|
2023-05-17 20:36:58 +03:00
|
|
|
|
2024-06-27 18:44:46 +03:00
|
|
|
Done.
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2024-07-01 20:28:52 +03:00
|
|
|
scratch/main> delete.term temp
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2024-06-27 18:44:46 +03:00
|
|
|
Done.
|
2023-05-17 20:36:58 +03:00
|
|
|
|
2022-01-17 03:25:50 +03:00
|
|
|
```
|
2024-07-10 17:46:18 +03:00
|
|
|
``` unison
|
2022-08-31 21:18:37 +03:00
|
|
|
x = 3
|
2022-01-17 03:25:50 +03:00
|
|
|
```
|
|
|
|
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2023-12-22 14:55:24 +03:00
|
|
|
Loading changes detected in scratch.u.
|
|
|
|
|
2022-01-17 03:25:50 +03:00
|
|
|
I found and typechecked these definitions in scratch.u. If you
|
|
|
|
do an `add` or `update`, here's how your codebase would
|
|
|
|
change:
|
|
|
|
|
2022-08-31 21:18:37 +03:00
|
|
|
⍟ These names already exist. You can `update` them to your
|
|
|
|
new definition:
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2022-04-07 00:20:44 +03:00
|
|
|
x : Nat
|
2022-01-17 03:25:50 +03:00
|
|
|
|
|
|
|
```
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2024-07-01 20:28:52 +03:00
|
|
|
scratch/main> update
|
2022-01-17 03:25:50 +03:00
|
|
|
|
2024-08-02 00:49:45 +03:00
|
|
|
This branch has more than one term with the name `x`. Please
|
|
|
|
delete or rename all but one of them, then try the update
|
|
|
|
again.
|
2024-06-27 18:44:46 +03:00
|
|
|
|
2022-01-17 03:25:50 +03:00
|
|
|
```
|