unison/unison-src/transcripts/update-on-conflict.output.md

Update on conflict

Conflicted definitions prevent update from succeeding.

x = 1
temp = 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`:
    
      temp : Nat
      x    : Nat

scratch/main> add

  ⍟ I've added these definitions:
  
    temp : Nat
    x    : Nat

scratch/main> debug.alias.term.force temp x

  Done.

scratch/main> delete.term temp

  Done.

x = 3

  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 names already exist. You can `update` them to your
      new definition:
    
      x : Nat

scratch/main> update

  This branch has more than one term with the name `x`. Please
  delete or rename all but one of them, then try the update
  again.