unisonweb/unison

suggested command in Tip about name conflict after `pull` misses necessary namespace prefix

Open

#957 opened on Nov 9, 2019

View on GitHub
 (0 comments) (0 reactions) (0 assignees)Haskell (304 forks)batch import
codebase-manager / ucmhelp wantedpapercut

Repository metrics

Stars
 (6,624 stars)
PR merge metrics
 (Avg merge 12d 19h) (6 merged PRs in 30d)

Description

.> pull git@github.com:unisonweb/base .base
⚙  git clone 'git@github.com:unisonweb/base' /Users/arya/.cache/unisonlanguage/gitfiles/f23fnd5mqdrj00ppt2qm9l4c4h90751b8kmdf6hb1hmb6977hj2h6ris0o2jib6a5td5ejh0qpgtatgovsbr20479k261vurbt55jt0/HEAD
Cloning into '/Users/arya/.cache/unisonlanguage/gitfiles/f23fnd5mqdrj00ppt2qm9l4c4h90751b8kmdf6hb1hmb6977hj2h6ris0o2jib6a5td5ejh0qpgtatgovsbr20479k261vurbt55jt0/HEAD'...
remote: Enumerating objects: 2664, done.
remote: Counting objects: 100% (2664/2664), done.
remote: Compressing objects: 100% (1822/1822), done.
remote: Total 2664 (delta 811), reused 2619 (delta 770), pack-reused 0
Receiving objects: 100% (2664/2664), 909.77 KiB | 119.00 KiB/s, done.
Resolving deltas: 100% (811/811), done.
Checking out files: 100% (5693/5693), done.
⚙  git -C /Users/arya/.cache/unisonlanguage/gitfiles/f23fnd5mqdrj00ppt2qm9l4c4h90751b8kmdf6hb1hmb6977hj2h6ris0o2jib6a5td5ejh0qpgtatgovsbr20479k261vurbt55jt0/HEAD rev-parse --git-dir
.git
⚙  git -C /Users/arya/.cache/unisonlanguage/gitfiles/f23fnd5mqdrj00ppt2qm9l4c4h90751b8kmdf6hb1hmb6977hj2h6ris0o2jib6a5td5ejh0qpgtatgovsbr20479k261vurbt55jt0/HEAD fetch 'git@github.com:unisonweb/base'
From github.com:unisonweb/base
 * branch            HEAD       -> FETCH_HEAD

  🆕
  
  Here's what's changed in .base after the pull:
  
  + Adds / updates:
  
    Char Char.fromNat Char.toNat Int.fromText Int.mod Int.toFloat Int.toText io.accept io.bracket
    io.clientSocket io.closeFile io.closeSocket io.createDirectory io.delay io.directoryContents
    io.fileExists io.fork io.getBuffering io.getCurrentDirectory io.getFileSize io.getFileTimestamp
    io.getLine io.getTemporaryDirectory io.getText io.IO io.IO.accept_ io.IO.bracket_
    io.IO.clientSocket_ io.IO.closeFile_ io.IO.closeSocket_ io.IO.createDirectory_ io.IO.delay_
    io.IO.directoryContents_ io.IO.fileExists_ io.IO.fork_ io.IO.getBuffering_
    io.IO.getCurrentDirectory_ io.IO.getFileSize_ io.IO.getFileTimestamp_ io.IO.getLine_
    io.IO.getTemporaryDirectory_ io.IO.getText_ io.IO.isDirectory_ io.IO.isFileEOF_
    io.IO.isFileOpen_ io.IO.isSeekable_ io.IO.kill_ io.IO.listen_ io.IO.openFile_ io.IO.position_
    io.IO.putText_ io.IO.receive_ io.IO.removeDirectory_ io.IO.removeFile_ io.IO.renameDirectory_
    io.IO.renameFile_ io.IO.seek_ io.IO.send_ io.IO.serverSocket_ io.IO.setBuffering_
    io.IO.setCurrentDirectory_ io.IO.systemTime_ io.IO.throw io.isDirectory io.isFileEOF
    io.isFileOpen io.isSeekable io.kill io.listen io.Mode io.Mode.Append io.Mode.Read
    io.Mode.ReadWrite io.Mode.Write io.openFile io.position io.printLine io.putText io.readLine
    io.receive io.removeDirectory io.removeFile io.renameDirectory io.renameFile io.rethrow io.seek
    io.send io.serverSocket io.setBuffering io.setCurrentDirectory io.systemTime Nat.fromText
    Nat.toFloat test.internals.v1.Domain test.internals.v1.Domain.boolean
    test.internals.v1.Domain.ints test.internals.v1.Domain.Large test.internals.v1.Domain.lift2
    test.internals.v1.Domain.lists test.internals.v1.Domain.listsOf test.internals.v1.Domain.map
    test.internals.v1.Domain.nats test.internals.v1.Domain.pairs test.internals.v1.Domain.sample
    test.internals.v1.Domain.Small test.internals.v1.Domain.smallSize
    test.internals.v1.Domain.tuples test.internals.v1.Domain.weighted test.internals.v1.foldReport
    test.internals.v1.foldScope test.internals.v1.foldStatus test.internals.v1.foldSuccess
    test.internals.v1.Scope.cons test.internals.v1.Status.combine test.internals.v1.Status.pending
    test.internals.v1.Success.combine test.internals.v1.Test.&& test.internals.v1.Test.check
    test.internals.v1.Test.check' test.internals.v1.Test.failed test.internals.v1.Test.failedWith
    test.internals.v1.Test.finished test.internals.v1.Test.forAll test.internals.v1.Test.forAll'
    test.internals.v1.Test.label test.internals.v1.Test.modifyScope
    test.internals.v1.Test.modifyStatus test.internals.v1.Test.passed
    test.internals.v1.Test.passedUnexpectedly test.internals.v1.Test.passedWith
    test.internals.v1.Test.pending test.internals.v1.Test.proved
    test.internals.v1.Test.provedUnexpectedly test.internals.v1.Test.provedWith
    test.internals.v1.Test.Report test.internals.v1.Test.report
    test.internals.v1.Test.Report.combine test.internals.v1.Test.Report.empty
    test.internals.v1.Test.Report.Report test.internals.v1.Test.Report.toCLIResult
    test.internals.v1.Test.run test.internals.v1.Test.runAll test.internals.v1.Test.Scope
    test.internals.v1.Test.Scope.Scope test.internals.v1.Test.Status
    test.internals.v1.Test.Status.Expected test.internals.v1.Test.Status.Failed
    test.internals.v1.Test.Status.Pending test.internals.v1.Test.Status.Unexpected
    test.internals.v1.Test.Success test.internals.v1.Test.Success.Passed
    test.internals.v1.Test.Success.Proved test.internals.v1.Test.Test
    test.internals.v1.Test.Test.Test test.v1.both test.v1.cost test.v1.empty test.v1.expect
    test.v1.fail test.v1.failWith test.v1.Gen test.v1.Gen.sample test.v1.Gen.toWeighted
    test.v1.label test.v1.list test.v1.nat test.v1.natIn test.v1.ok test.v1.okWith test.v1.pick
    test.v1.prove test.v1.proveWith test.v1.run test.v1.runs test.v1.sample test.v1.Test
    test.v1.tests test.v1.unexpected.ok test.v1.unexpected.proven Text.fromCharList Text.toCharList
    Text.uncons Text.unsnoc Unit
  
  > Moves:
  
    Original name New name
    ().()         Unit.Unit
    Float.gte     Float.gteq
    Float.lte     Float.lteq
    Int.gte       Int.gteq
    Int.lte       Int.lteq
    Nat.gte       Nat.gteq
    Nat.lte       Nat.lteq
    Text.gte      Text.gteq
    Text.lte      Text.lteq
  
  = Copies:
  
    Original name New name(s)
    ()            Unit
  
  Tip: You can always `undo` if this wasn't what you wanted.


  ❓
  
  These types have conflicting definitions: List
  
  Tip: This occurs when merging branches that both independently introduce the same name. Use
       `view List` to see the conflicting defintions, then use `move.type` to resolve the
       conflicts.

.> 
.> view List

  ⚠️
  
  The following names were not found in the codebase. Check your spelling.
    List

.>

You just told me to view List! :) You meant I should view .base.List.

Contributor guide