Author Topic: zed update all reporting changed files/untracked working tree files  (Read 407 times)

Offline lukeren

  • Junior Indexer
  • **
  • Posts: 17
  • Helpful: +0/-0
I'm trying to update nzedb with ./zed update all, but I'm getting these errors.
I haven't changed any files.

Code: [Select]
From https://github.com/nZEDb/nZEDb
 * branch                0.x        -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
        resources/db/schema/data/10-categories.tsv
        resources/db/schema/mysql-ddl.sql
        www/admin/ajax.php
        www/admin/predb.php
        www/install/install.php
        www/smarty.php
        www/themes/Omicron/templates/viewnzb.tpl
        www/themes/Omicron/templates/viewserieslist.tpl
        www/themes/shared/templates/paginate.tpl
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
        app/controllers/CountriesController.php
        app/controllers/GroupsController.php
        app/controllers/MultigroupPostersController.php
        app/controllers/PredbController.php
        app/controllers/VideosController.php
        app/extensions/action/Controller.php
        app/models/Countries.php
        app/models/Films.php
        app/models/Groups.php
        app/models/Tables.php
        app/models/Videos.php
        app/tests/cases/controllers/CountriesControllerTest.php
        app/tests/cases/controllers/MultigroupPostersControllerTest.php
        app/tests/cases/controllers/VideosControllerTest.php
        app/tests/cases/extensions/util/YencTest.php
        app/tests/cases/extensions/util/yenc/yenc-test.txt
        app/tests/cases/extensions/util/yenc/yenc-test.ync
        app/tests/cases/extensions/util/yenc/yenc1.zip
        app/tests/cases/extensions/util/yenc/yenc2.zip
        app/tests/cases/models/CountriesTest.php
        app/tests/cases/models/MultigroupPostersTest.php
        app/tests/cases/models/VideosTest.php
        resources/db/patches/mysql/0484~collections.sql
        resources/db/patches/mysql/0485~countries.sql
        resources/db/patches/mysql/0486~categories.sql
Please move or remove them before you merge.
Aborting

Should I just do 'git stash' and then delete the untracked files it's complaining about?

I'm not sure which version I'm on, where do I see this?

Offline Wally73

  • Overlord
  • ******
  • Posts: 266
  • Helpful: +31/-1
  • i'm nuts
just do git stash and then run ./zed update all again

Offline lukeren

  • Junior Indexer
  • **
  • Posts: 17
  • Helpful: +0/-0
Didn't get to this until today. After a git stash, it still complains about the untracked files.
Not really sure if I should just delete them?