search

vlang / v

Simple, fast, safe, compiled language for developing maintainable software. Compiles itself in <1s with zero library dependencies. Supports automatic C => V translation. https://vlang.io
MIT License
35.79k stars 2.16k forks source link

v up: untracked working tree files will be overwritten by merge #7515

Closed kokizzu closed 3 years ago

kokizzu commented 3 years ago

V version: V 0.2 36dcace OS: Ubuntu 20.04 5.4.0-51-lowlatency #56-Ubuntu SMP PREEMPT Mon Oct 5 15:52:03 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux (v doctor too slow)

What did you do?

# download from vlang.io, extract
make
v symlink
v up

What did you expect to see?

updated successfully?

What did you see instead?

Updating V...
From https://github.com/vlang/v
 * branch            master     -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
        0.3_roadmap.txt
        BSDmakefile
        CHANGELOG.md
        CODE_OF_CONDUCT.md
        CONTRIBUTING.md
        Dockerfile
        Dockerfile.alpine
        Dockerfile.cross
        LICENSE
        Makefile
        README.md
        TESTS.md
        cmd/tools/bench/wyhash.v
        cmd/tools/check-md.v
        cmd/tools/check_os_api_parity.v
        cmd/tools/fast/.gitignore
        cmd/tools/fast/fast.v
        cmd/tools/fast/fast_main.js
        cmd/tools/fast/footer.html
        cmd/tools/fast/header.html
        cmd/tools/fuzz/fuzz.sh
        cmd/tools/fuzz/map_fuzz.v
        cmd/tools/gen1m.v
        cmd/tools/gen_vc.v
        cmd/tools/missdoc.v
        cmd/tools/modules/scripting/scripting.v
        cmd/tools/modules/testing/common.v
        cmd/tools/modules/vgit/vgit.v
        cmd/tools/modules/vhelp/vhelp.v
        cmd/tools/oldv.v
        cmd/tools/performance_compare.v
        cmd/tools/preludes/README.md
        cmd/tools/preludes/live.v
        cmd/tools/preludes/live_main.v
        cmd/tools/preludes/live_shared.v
        cmd/tools/preludes/profiled_program.v
        cmd/tools/preludes/tests_assertions.v
        cmd/tools/preludes/tests_with_stats.v
        cmd/tools/repeat.v
        cmd/tools/test_os_process.v
        cmd/tools/vbin2v.v
        cmd/tools/vbuild-examples.v
        cmd/tools/vbuild-tools.v
        cmd/tools/vbuild-vbinaries.v
        cmd/tools/vcomplete.v
        cmd/tools/vcreate.v
        cmd/tools/vdoc-resources/arrow.svg
        cmd/tools/vdoc-resources/dark-mode.js
        cmd/tools/vdoc-resources/dark.svg
        cmd/tools/vdoc-resources/doc.css
        cmd/tools/vdoc-resources/doc.js
        cmd/tools/vdoc-resources/favicons/android-chrome-192x192.png
        cmd/tools/vdoc-resources/favicons/android-chrome-512x512.png
        cmd/tools/vdoc-resources/favicons/apple-touch-icon.png
        cmd/tools/vdoc-resources/favicons/browserconfig.xml
        cmd/tools/vdoc-resources/favicons/favicon-16x16.png
        cmd/tools/vdoc-resources/favicons/favicon-32x32.png
        cmd/tools/vdoc-resources/favicons/favicon.ico
        cmd/tools/vdoc-resources/favicons/mstile-144x144.png
        cmd/tools/vdoc-resources/favicons/mstile-150x150.png
        cmd/tools/vdoc-resources/favicons/mstile-310x150.png
        cmd/tools/vdoc-resources/favicons/mstile-310x310.png
        cmd/tools/vdoc-resources/favicons/mstile-70x70.png
        cmd/tools/vdoc-resources/favicons/safari-pinned-tab.svg
        cmd/tools/vdoc-resources/favicons/site.webmanifest
        cmd/tools/vdoc-resources/light.svg
        cmd/tools/vdoc-resources/link.svg
        cmd/tools/vdoc-resources/menu.svg
        cmd/tools/vdoc-resources/normalize.css
        cmd/tools/vdoc.v
        cmd/tools/vdoctor.v
        cmd/tools/vfmt.v
        cmd/tools/vpm.v
        cmd/tools/vrepl.v
        cmd/tools/vself.v
        cmd/tools/vsetup-freetype.v
        cmd/tools/vsymlink.v
        cmd/tools/vtest-cleancode.v
        cmd/tools/vtest-compiler.v
        cmd/tools/vtest-fixed.v
        cmd/tools/vtest-fmt.v
        cmd/tools/vtest-parser.v
        cmd/tools/vtest.v
        cmd/tools/vtracev.v
        cmd/tools/vup.v
        cmd/tools/vvet.v
        cmd/v/help/bin2v.txt
        cmd/v/help/build-c.txt
        cmd/v/help/build.txt
        cmd/v/help/default.txt
        cmd/v/help/doc.txt
        cmd/v/help/fmt.txt
        cmd/v/help/help.v
        cmd/v/help/install.txt
        cmd/v/help/other.txt
        cmd/v/help/remove.txt
        cmd/v/help/run.txt
        cmd/v/help/search.txt
        cmd/v/help/test.txt
        cmd/v/help/update.txt
        cmd/v/help/vpm.txt
        cmd/v/v.v
        doc/docs.md
        doc/upcoming.md
        examples/.gitignore
        examples/2048/.gitignore
        examples/2048/2048.v
        examples/2048/LICENSE
        examples/2048/README.md
        examples/2048/demo.png
        examples/2048/v.mod
        examples/assets/fonts/LICENSE
        examples/assets/fonts/RobotoMono-Regular.ttf
        examples/buf_reader.v
        examples/cli.v
        examples/compiletime/compile-time-for.v
        examples/concurrency/concurrency.v
        examples/concurrency/concurrency_http.v
        examples/database/mysql.v
        examples/database/pg/.gitignore
        examples/database/pg/customer.v
        examples/database/pg/mydb.sql
        examples/database/sqlite.v
        examples/eventbus/eventbus.v
        examples/eventbus/modules/some_module/some_module.v
        examples/fetch.v
        examples/fibonacci.v
        examples/fizz_buzz.v
        examples/game_of_life/README.md
        examples/game_of_life/demo.gif
        examples/game_of_life/life.v
        examples/game_of_life/life_gg.v
        examples/game_of_life/modules/automaton/automaton.v
        examples/gg/logo.png
        examples/gg/raven_text_rendering.v
        examples/gg/rectangles.v
        examples/hanoi.v
        examples/hello_v_js.v
        examples/hello_world.v
        examples/hot_reload/.gitignore
        examples
Aborting
serkonda7 commented 3 years ago

This happens if the files are changed manually. If it's a desired change that you want to contribute to V, you should save them in a new branch, if not discard them.