2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2024-06-12 01:22:09 +03:00
|
|
|
scratch/main> builtins.merge
|
2023-11-07 21:46:14 +03:00
|
|
|
|
|
|
|
Done.
|
|
|
|
|
|
|
|
```
|
2024-07-10 17:46:18 +03:00
|
|
|
``` unison
|
2023-11-07 21:46:14 +03:00
|
|
|
foo : Nat
|
|
|
|
foo = 5
|
|
|
|
|
|
|
|
bar : Nat
|
|
|
|
bar = 5
|
|
|
|
```
|
|
|
|
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2023-11-07 21:46:14 +03:00
|
|
|
|
2023-12-22 14:55:24 +03:00
|
|
|
Loading changes detected in scratch.u.
|
|
|
|
|
2023-11-07 21:46:14 +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`:
|
|
|
|
|
|
|
|
bar : Nat
|
|
|
|
foo : Nat
|
|
|
|
|
|
|
|
```
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2024-06-12 01:22:09 +03:00
|
|
|
scratch/main> add
|
2023-11-07 21:46:14 +03:00
|
|
|
|
|
|
|
⍟ I've added these definitions:
|
|
|
|
|
|
|
|
bar : Nat
|
|
|
|
foo : Nat
|
|
|
|
|
|
|
|
```
|
2024-07-10 17:46:18 +03:00
|
|
|
``` unison
|
2023-11-07 21:46:14 +03:00
|
|
|
foo : Nat
|
|
|
|
foo = 6
|
|
|
|
|
|
|
|
bar : Nat
|
|
|
|
bar = 7
|
|
|
|
```
|
|
|
|
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2023-11-07 21:46:14 +03:00
|
|
|
|
2023-12-22 14:55:24 +03:00
|
|
|
Loading changes detected in scratch.u.
|
|
|
|
|
2023-11-07 21:46:14 +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 names already exist. You can `update` them to your
|
|
|
|
new definition:
|
|
|
|
|
|
|
|
bar : Nat
|
2023-11-08 20:11:16 +03:00
|
|
|
(The old definition is also named foo.)
|
2023-11-07 21:46:14 +03:00
|
|
|
foo : Nat
|
2023-11-08 20:11:16 +03:00
|
|
|
(The old definition is also named bar.)
|
2023-11-07 21:46:14 +03:00
|
|
|
|
|
|
|
```
|
2024-07-10 19:17:15 +03:00
|
|
|
``` ucm
|
2024-06-12 01:22:09 +03:00
|
|
|
scratch/main> update
|
2023-11-07 21:46:14 +03:00
|
|
|
|
2023-11-14 06:36:03 +03:00
|
|
|
Okay, I'm searching the branch for code that needs to be
|
|
|
|
updated...
|
|
|
|
|
2023-11-08 01:55:38 +03:00
|
|
|
Done.
|
|
|
|
|
2024-06-12 01:22:09 +03:00
|
|
|
scratch/main> view foo bar
|
2023-11-07 21:46:14 +03:00
|
|
|
|
|
|
|
bar : Nat
|
|
|
|
bar = 7
|
|
|
|
|
|
|
|
foo : Nat
|
|
|
|
foo = 6
|
|
|
|
|
|
|
|
```
|