Skip to content

Instantly share code, notes, and snippets.

@timbunce
Created June 11, 2015 21:54
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save timbunce/2440accbede7255168c6 to your computer and use it in GitHub Desktop.
Save timbunce/2440accbede7255168c6 to your computer and use it in GitHub Desktop.
rakudobrew build-panda failure "error: The following untracked working tree files would be overwritten by merge"
[timbo@timac (master %=) rakudobrew]$ rakudobrew build-panda
remote: Counting objects: 1813, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 1813 (delta 242), reused 242 (delta 242), pack-reused 1569
Receiving objects: 100% (1813/1813), 260.30 KiB | 16.00 KiB/s, done.
Resolving deltas: 100% (826/826), completed with 48 local objects.
From git://github.com/tadzik/panda
e3fb048..74a48bf master -> origin/master
370c903..19bb91d CPAN -> origin/CPAN
* [new branch] coercion-types -> origin/coercion-types
* [new branch] curly -> origin/curly
* [new branch] ecosystem-api -> origin/ecosystem-api
* [new branch] revdep-rebuild -> origin/revdep-rebuild
* [new branch] subtree -> origin/subtree
* [new branch] subtree-squash -> origin/subtree-squash
* [new tag] 2015.04 -> 2015.04
* [new tag] 2015.05 -> 2015.05
fatal: bad object 4148627054eb9c1f74724c69bc26320c89f6dd0a
fatal: bad object ca2b8ac4511ca9ab060917ba4101a1f698324a04
fatal: bad object 3a82d4bb1f37ef04fb20bd2473d500e51c723f61
Fetching submodule ext/File__Find
remote: Counting objects: 49, done.
remote: Total 49 (delta 14), reused 14 (delta 14), pack-reused 35
Unpacking objects: 100% (49/49), done.
From git://github.com/tadzik/File-Find
d79a831..119e620 master -> origin/master
Fetching submodule ext/JSON__Tiny
remote: Counting objects: 79, done.
remote: Total 79 (delta 28), reused 28 (delta 28), pack-reused 51
Unpacking objects: 100% (79/79), done.
From git://github.com/moritz/json
88ecaf6..635a8ae master -> origin/master
Fetching submodule ext/Shell__Command
remote: Counting objects: 21, done.
remote: Total 21 (delta 5), reused 5 (delta 5), pack-reused 16
Unpacking objects: 100% (21/21), done.
From git://github.com/tadzik/Shell-Command
bc4f3a7..c8697ae master -> origin/master
Updating e3fb048..74a48bf
error: The following untracked working tree files would be overwritten by merge:
ext/File__Find/LICENSE
ext/File__Find/META.info
ext/File__Find/lib/File/Find.pm
ext/File__Find/t/01-file-find.t
ext/File__Find/t/dir1/another_dir/empty_file
ext/File__Find/t/dir1/another_dir/file.bar
ext/File__Find/t/dir1/file.bar
ext/File__Find/t/dir1/file.foo
ext/File__Find/t/dir1/foodir/not_a_dir
ext/JSON__Tiny/.gitignore
ext/JSON__Tiny/META.info
ext/JSON__Tiny/README
ext/JSON__Tiny/lib/JSON/Tiny.pm
ext/JSON__Tiny/lib/JSON/Tiny/Actions.pm
ext/JSON__Tiny/lib/JSON/Tiny/Grammar.pm
ext/JSON__Tiny/logotype/logo_32x32.png
ext/JSON__Tiny/t/01-parse.t
ext/JSON__Tiny/t/02-structure.t
ext/JSON__Tiny/t/03-unicode.t
ext/JSON__Tiny/t/04-roundtrip.t
ext/Shell__Command/LICENSE
ext/Shell__Command/META.info
ext/Shell__Command/README
ext/Shell__Command/lib/Shell/Command.pm
ext/Shell__Command/t/02-shell-command.t
ext/Shell__Command/t/dir1/another_dir/empty_file
ext/Shell__Command/t/dir1/another_dir/file.bar
ext/Shell__Command/t/dir1/file.bar
ext/Shell__Command/t/dir1/file.foo
ext/Shell__Command/t/dir1/foodir/not_a_dir
Please move or remove them before you can merge.
Aborting
Failed running git pull at /Users/timbo/.rakudobrew/bin/rakudobrew line 45.
main::run('git pull') called at /Users/timbo/.rakudobrew/bin/rakudobrew line 329
main::build_panda(undef) called at /Users/timbo/.rakudobrew/bin/rakudobrew line 97
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment