mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 10:35:57 +03:00
delete project-merge.md
This commit is contained in:
Mitchell Rosen
parent
19da19b259
commit
c5f4d6d5b7
@ -1,39 +0,0 @@
|
||||
# projects merge
|
||||
|
||||
```ucm
|
||||
.> builtins.merge
|
||||
```
|
||||
|
||||
```unison
|
||||
zonk = 0
|
||||
```
|
||||
|
||||
```ucm
|
||||
.foo> add
|
||||
.> project.create-empty foo
|
||||
.> merge.old foo foo/main
|
||||
```
|
||||
|
||||
```unison
|
||||
bonk = 2
|
||||
```
|
||||
|
||||
```ucm
|
||||
foo/main> add
|
||||
```
|
||||
|
||||
```ucm
|
||||
.> project.create-empty bar
|
||||
bar/main> merge.old foo/main
|
||||
bar/main> branch /topic
|
||||
```
|
||||
|
||||
```unison
|
||||
xonk = 1
|
||||
```
|
||||
|
||||
```ucm
|
||||
bar/main> add
|
||||
bar/topic> merge.old /main
|
||||
.bar> merge.old foo/main
|
||||
```
|
||||
@ -1,193 +0,0 @@
|
||||
# projects merge
|
||||
|
||||
```ucm
|
||||
.> builtins.merge
|
||||
|
||||
Done.
|
||||
|
||||
```
|
||||
```unison
|
||||
zonk = 0
|
||||
```
|
||||
|
||||
```ucm
|
||||
|
||||
Loading changes detected in scratch.u.
|
||||
|
||||
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`:
|
||||
|
||||
zonk : Nat
|
||||
|
||||
```
|
||||
```ucm
|
||||
☝️ The namespace .foo is empty.
|
||||
|
||||
.foo> add
|
||||
|
||||
⍟ I've added these definitions:
|
||||
|
||||
zonk : ##Nat
|
||||
|
||||
.> project.create-empty foo
|
||||
|
||||
🎉 I've created the project foo.
|
||||
|
||||
🎨 Type `ui` to explore this project's code in your browser.
|
||||
🔭 Discover libraries at https://share.unison-lang.org
|
||||
📖 Use `help-topic projects` to learn more about projects.
|
||||
|
||||
Write your first Unison code with UCM:
|
||||
|
||||
1. Open scratch.u.
|
||||
2. Write some Unison code and save the file.
|
||||
3. In UCM, type `add` to save it to your new project.
|
||||
|
||||
🎉 🥳 Happy coding!
|
||||
|
||||
.> merge.old foo foo/main
|
||||
|
||||
Here's what's changed in foo/main after the merge:
|
||||
|
||||
Added definitions:
|
||||
|
||||
1. zonk : 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...
|
||||
|
||||
```
|
||||
```unison
|
||||
bonk = 2
|
||||
```
|
||||
|
||||
```ucm
|
||||
|
||||
Loading changes detected in scratch.u.
|
||||
|
||||
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`:
|
||||
|
||||
bonk : Nat
|
||||
|
||||
```
|
||||
```ucm
|
||||
foo/main> add
|
||||
|
||||
⍟ I've added these definitions:
|
||||
|
||||
bonk : ##Nat
|
||||
|
||||
```
|
||||
```ucm
|
||||
.> project.create-empty bar
|
||||
|
||||
🎉 I've created the project bar.
|
||||
|
||||
🎨 Type `ui` to explore this project's code in your browser.
|
||||
🔭 Discover libraries at https://share.unison-lang.org
|
||||
📖 Use `help-topic projects` to learn more about projects.
|
||||
|
||||
Write your first Unison code with UCM:
|
||||
|
||||
1. Open scratch.u.
|
||||
2. Write some Unison code and save the file.
|
||||
3. In UCM, type `add` to save it to your new project.
|
||||
|
||||
🎉 🥳 Happy coding!
|
||||
|
||||
bar/main> merge.old foo/main
|
||||
|
||||
Here's what's changed in the current namespace after the
|
||||
merge:
|
||||
|
||||
Added definitions:
|
||||
|
||||
1. bonk : ##Nat
|
||||
2. zonk : ##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...
|
||||
|
||||
bar/main> branch /topic
|
||||
|
||||
Done. I've created the topic branch based off of main.
|
||||
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge /topic`.
|
||||
|
||||
```
|
||||
```unison
|
||||
xonk = 1
|
||||
```
|
||||
|
||||
```ucm
|
||||
|
||||
Loading changes detected in scratch.u.
|
||||
|
||||
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`:
|
||||
|
||||
xonk : ##Nat
|
||||
|
||||
```
|
||||
```ucm
|
||||
bar/main> add
|
||||
|
||||
⍟ I've added these definitions:
|
||||
|
||||
xonk : ##Nat
|
||||
|
||||
bar/topic> merge.old /main
|
||||
|
||||
Here's what's changed in the current namespace after the
|
||||
merge:
|
||||
|
||||
Added definitions:
|
||||
|
||||
1. xonk : ##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...
|
||||
|
||||
☝️ The namespace .bar is empty.
|
||||
|
||||
.bar> merge.old foo/main
|
||||
|
||||
Here's what's changed in the current namespace after the
|
||||
merge:
|
||||
|
||||
Added definitions:
|
||||
|
||||
1. bonk : ##Nat
|
||||
2. zonk : ##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...
|
||||
|
||||
```
|
||||
Loading…
Reference in New Issue
Block a user