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

Update transcripts to use implicit project creation

Browse Source
This commit is contained in:
Chris Penner 2024-06-11 15:08:02 -07:00
parent 0ef189865d
commit ae7cf3d0a5
1 changed files with 0 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -917,143 +917,6 @@ We will resolve this situation automatically in a future version.
project/main> builtins.mergeio lib.builtins
```
```ucm:hide
project/main> branch alice
```
Alice's additions:
```unison:hide
unique type Foo = Bar
alice : Foo -> Nat
alice _ = 18
```
```ucm:hide
project/alice> add
project/main> branch bob
```
Bob's additions:
```unison:hide
unique type Foo = Bar
bob : Foo -> Nat
bob _ = 19
```
```ucm:hide
project/bob> add
```
```ucm:error
project/alice> merge bob
```
```ucm:hide
.> project.delete project
```
## `merge.commit` example (success)
After merge conflicts are resolved, you can use `merge.commit` rather than `switch` + `merge` + `branch.delete` to
"commit" your changes.
```ucm:hide
.> project.create-empty project
project/main> builtins.mergeio lib.builtins
```
Original branch:
```unison:hide
foo : Text
foo = "old foo"
```
```ucm:hide
project/main> add
project/main> branch alice
```
Alice's changes:
```unison:hide
foo : Text
foo = "alices foo"
```
```ucm:hide
project/alice> update
project/main> branch bob
```
Bob's changes:
```unison:hide
foo : Text
foo = "bobs foo"
```
Attempt to merge:
```ucm:hide
project/bob> update
```
```ucm:error
project/alice> merge /bob
```
Resolve conflicts and commit:
```unison
foo : Text
foo = "alice and bobs foo"
```
```ucm
project/merge-bob-into-alice> update
project/merge-bob-into-alice> merge.commit
project/alice> view foo
project/alice> branches
```
```ucm:hide
.> project.delete project
```
## `merge.commit` example (failure)
`merge.commit` can only be run on a "merge branch".
```ucm:hide
.> project.create-empty project
project/main> builtins.mergeio lib.builtins
```
```ucm
project/main> branch topic
```
```ucm:error
project/topic> merge.commit
```
```ucm:hide
.> project.delete project
```
## Precondition violations
There are a number of conditions under which we can't perform a merge, and the user will have to fix up the namespace(s) manually before attempting to merge again.
### Conflicted aliases
If `foo` and `bar` are aliases in the nearest common ancestor, but not in Alice's branch, then we don't know whether to update Bob's dependents to Alice's `foo` or Alice's `bar` (and vice-versa).
```ucm:hide
project/main> builtins.mergeio lib.builtins
```
Original branch:
```unison:hide
foo : Nat