unison/unison-src/transcripts/project-merge.output.md

projects merge

.> builtins.merge

  Done.

zonk = 0

  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

  ☝️  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 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...

bonk = 2

  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

foo/main> add

  ⍟ I've added these definitions:
  
    bonk : ##Nat

.> 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 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: Use `merge /topic /main` to merge your work back into the
       main branch.

xonk = 1

  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

bar/main> add

  ⍟ I've added these definitions:
  
    xonk : ##Nat

bar/topic> merge /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 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...