Author Topic: Problem installing latest 0.7.4 update  (Read 1455 times)

Offline xeddog

  • Prolific Indexer
  • ****
  • Posts: 240
  • Helpful: +9/-2
Problem installing latest 0.7.4 update
« on: 2017-08-09, 02:33:09 pm »
When I ran ./zed update nzedb this morning I got:
Quote
Beginning nzedb update 08092017 13:47:30
From https://github.com/nZEDb/nZEDb
 * branch            0.x        -> FETCH_HEAD
   9d4dee1..07ce6f0  0.x        -> origin/0.x
error: Your local changes to the following files would be overwritten by merge:
   ReleaseNotes
   composer.lock
   nzedb/db/PreDb.php
   nzedb/processing/tv/TMDB.php
   resources/db/patches/mysql/0482~release_naming_regexes.sql
   www/themes/shared/templates/admin/collection_regexes-test.tpl
Please, commit your changes or stash them before you can merge.
Aborting

Update completed at 08092017 13:47:35
I'm not sure why it says "my local changes" since I don't think I made any, but I ran "git commit -a" anyway, and that seems to have run without error.  Then when I ran /zed update nzedb again I got: 
Quote
From https://github.com/nZEDb/nZEDb
 * branch            0.x        -> FETCH_HEAD

and then got my terminal prompt.  I then ran my nZEDb start script which does the update again expecting to see the "already up to date " message, but got this instead:
Quote
Beginning nzedb update 08092017 14:02:07
error: Pull is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Update completed at 08092017 14:02:07
 

I have no idea what to do about this so any help would be appreciated.

Thanks,

Wayne

Offline Darius

  • Enforcer
  • *****
  • Posts: 121
  • Helpful: +8/-1
Re: Problem installing latest 0.7.4 update
« Reply #1 on: 2017-08-10, 02:51:10 pm »
git reset --hard origin/0.x

Offline xeddog

  • Prolific Indexer
  • ****
  • Posts: 240
  • Helpful: +9/-2
Re: Problem installing latest 0.7.4 update
« Reply #2 on: 2017-08-12, 09:52:05 pm »
Thank you.  I thought that was what I should do, but wasn't sure.

Wayne