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

Update merge.md and fix5129

Browse Source
This commit is contained in:
Chris Penner 2024-07-01 23:35:58 -07:00
parent b636068ebd
commit 6f19a87497
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unison-src/transcripts-using-base/fix5129.md
View File

@ -1,5 +1,5 @@
```ucm:hide
.> builtins.mergeio
scratch/main> builtins.mergeio lib.builtins
```
Checks for some bad type checking behavior. Some ability subtyping was

14
unison-src/transcripts/merge.md
View File

@ -464,7 +464,7 @@ project/main> merge /topic
```
```ucm:hide
.> project.delete project
scratch/main> project.delete project
```
## Merge failure: someone deleted something
@ -962,7 +962,7 @@ project/alice> merge bob
```
```ucm:hide
.> project.delete project
scratch/main> project.delete project
```
## `merge.commit` example (success)
@ -971,7 +971,6 @@ After merge conflicts are resolved, you can use `merge.commit` rather than `swit
"commit" your changes.
```ucm:hide
.> project.create-empty project
project/main> builtins.mergeio lib.builtins
```
@ -1028,7 +1027,7 @@ project/alice> branches
```
```ucm:hide
.> project.delete project
scratch/main> project.delete project
```
## `merge.commit` example (failure)
@ -1036,7 +1035,6 @@ project/alice> branches
`merge.commit` can only be run on a "merge branch".
```ucm:hide
.> project.create-empty project
project/main> builtins.mergeio lib.builtins
```
@ -1049,7 +1047,7 @@ project/topic> merge.commit
```
```ucm:hide
.> project.delete project
scratch/main> project.delete project
```
@ -1527,7 +1525,7 @@ project/main> view Foo
```
```ucm:hide
.> project.delete project
scratch/main> project.delete project
```
### Dependent that doesn't need to be in the file
@ -1592,7 +1590,7 @@ project/alice> merge /bob
But `bar` was put into the scratch file instead.
```ucm:hide
.> project.delete project
scratch/main> project.delete project
```
### Merge loop test