unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 10:35:57 +03:00
Code Issues Projects Releases Wiki Activity

in update-on-conflict.md, replace use of merge.old with debug.alias.term.force

Browse Source
This commit is contained in:
Mitchell Rosen 2024-06-27 11:44:46 -04:00
parent d9618f7ab3
commit d1f2d78638
2 changed files with 26 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unison-src/transcripts/update-on-conflict.md
View File

@ -1,28 +1,28 @@
# Update on conflict
Updating conflicted definitions works fine.
```ucm:hide
.> builtins.merge
.merged> builtins.merge
```
```unison
a.x = 1
b.x = 2
x = 1
temp = 2
```
Cause a conflict:
```ucm
.> add
.merged> merge.old .a
.merged> merge.old .b
.> debug.alias.term.force temp x
.> delete.term temp
```
Updating conflicted definitions works fine.
```unison
x = 3
```
```ucm
.merged> update
.> update
.> view x
```

59
unison-src/transcripts/update-on-conflict.output.md
View File

@ -1,8 +1,10 @@
# Update on conflict
Updating conflicted definitions works fine.
```unison
a.x = 1
b.x = 2
x = 1
temp = 2
```
```ucm
@ -15,57 +17,27 @@ b.x = 2
⍟ These new definitions are ok to `add`:
a.x : Nat
b.x : Nat
temp : Nat
x : Nat
```
Cause a conflict:
```ucm
.> add
⍟ I've added these definitions:
a.x : Nat
b.x : Nat
temp : Nat
x : Nat
.merged> merge.old .a
.> debug.alias.term.force temp x
Here's what's changed in the current namespace after the
merge:
Added definitions:
1. x : Nat
Tip: You can use `todo` to see if this generated any work to
do in this namespace and `test` to run the tests. Or you
can use `undo` or `reflog` to undo the results of this
merge.
Done.
Applying changes from patch...
.> delete.term temp
.merged> merge.old .b
Here's what's changed in the current namespace after the
merge:
New name conflicts:
1. x#gjmq673r1v : Nat
↓
2. ┌ x#dcgdua2lj6 : Nat
3. └ x#gjmq673r1v : Nat
Tip: You can use `todo` to see if this generated any work to
do in this namespace and `test` to run the tests. Or you
can use `undo` or `reflog` to undo the results of this
merge.
Applying changes from patch...
Done.
```
Updating conflicted definitions works fine.
```unison
x = 3
```
@ -85,11 +57,16 @@ x = 3
```
```ucm
.merged> update
.> update
Okay, I'm searching the branch for code that needs to be
updated...
Done.
.> view x
x : Nat
x = 3
```