File tree Expand file tree Collapse file tree 2 files changed +10
-8
lines changed
transcripts/share-apis/sync Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -78,6 +78,8 @@ myproject/main> branch.create-empty dest
7878
7979myproject/dest> pull.without-history @transcripts/myproject/main
8080
81+ Updating branch from #sg60bvjo91 to #gd3audeh9u
82+
8183 ✅
8284
8385 Successfully updated myproject/dest from
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ ys = [!a, !b] :+ 3
3030
3131 + a : 'Nat
3232 + b : 'Nat
33- + xs : ['{g} Nat]
33+ + xs : ['Nat]
3434 + ys : [Nat]
3535
3636 Run `update` to apply these changes to your codebase.
@@ -45,7 +45,7 @@ Push and pull it back.
4545``` ucm
4646proj/main> push @transcripts/proj/main
4747
48- Uploaded 457 entities.
48+ Uploaded 464 entities.
4949
5050 I just created @transcripts/proj on http://localhost:5424
5151
@@ -66,13 +66,13 @@ proj/pulled> pull @transcripts/proj/main
6666proj/pulled> ls .
6767
6868 1. A (type)
69- 2. A/ (2 terms)
69+ 2. A. (2 terms)
7070 3. B (type)
71- 4. B/ (2 terms)
71+ 4. B. (2 terms)
7272 5. a ('Nat)
7373 6. b ('Nat)
74- 7. builtin/ (609 terms, 101 types)
75- 8. xs (['{g} Nat])
74+ 7. builtin. (667 terms, 104 types)
75+ 8. xs (['Nat])
7676 9. ys ([Nat])
7777```
7878
@@ -147,13 +147,13 @@ proj/diverge> pull @transcripts/proj/main
147147
148148 When you're done, you can run
149149
150- merge.commit
150+ update
151151
152152 to merge your changes back into diverge and delete the
153153 temporary branch. Or, if you decide to cancel the merge
154154 instead, you can run
155155
156- delete.branch /merge-remote-main-into-diverge
156+ cancel
157157
158158 to delete the temporary branch and switch back to diverge.
159159```
You can’t perform that action at this time.
0 commit comments