Upgrading NodeBB 0.7.1 Merge Conflicts?

[SimonQ]

I'm upgrading my NodeBB from 0.7.0 to 0.7.1. I'm following the official docs but, when I do git pull I am greeted with the following:

remote: Counting objects: 1744, done.
remote: Compressing objects: 100% (62/62), done.
remote: Total 1744 (delta 942), reused 936 (delta 936), pack-reused 746
Receiving objects: 100% (1744/1744), 472.48 KiB | 0 bytes/s, done.
Resolving deltas: 100% (1337/1337), completed with 460 local objects.
From https://github.com/NodeBB/NodeBB
 + 3e386e7...8d786a1 v0.7.x     -> origin/v0.7.x  (forced update)
   5ee1951..1a56267  master     -> origin/master
 * [new tag]         v0.7.1     -> v0.7.1
Auto-merging src/upgrade.js
Auto-merging src/topics/teaser.js
Auto-merging src/database/redis.js
CONFLICT (content): Merge conflict in src/database/redis.js
Auto-merging src/database/mongo.js
CONFLICT (content): Merge conflict in src/database/mongo.js
Auto-merging src/controllers/accounts.js
CONFLICT (content): Merge conflict in src/controllers/accounts.js
Removing public/src/modules/composer/uploads.js
Removing public/src/modules/composer/tags.js
Removing public/src/modules/composer/resize.js
Removing public/src/modules/composer/preview.js
Removing public/src/modules/composer/formatting.js
Removing public/src/modules/composer/drafts.js
Removing public/src/modules/composer/controls.js
Removing public/src/modules/composer/categoryList.js
Removing public/src/modules/composer.js
Removing public/less/admin/manage/groups.less
Auto-merging public/language/zh_CN/user.json
Auto-merging public/language/zh_CN/topic.json
CONFLICT (content): Merge conflict in public/language/zh_CN/topic.json
Auto-merging public/language/zh_CN/global.json
Auto-merging public/language/zh_CN/error.json
CONFLICT (content): Merge conflict in public/language/zh_CN/error.json
Auto-merging public/language/pt_BR/user.json
Auto-merging public/language/pt_BR/error.json
Auto-merging public/language/fr/groups.json
Auto-merging public/language/es/user.json
Auto-merging public/language/ar/topic.json
Auto-merging public/language/ar/search.json
CONFLICT (content): Merge conflict in public/language/ar/search.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging npm-shrinkwrap.json
CONFLICT (add/add): Merge conflict in npm-shrinkwrap.json
Auto-merging app.js
CONFLICT (content): Merge conflict in app.js
Automatic merge failed; fix conflicts and then commit the result.

How would I fix these conflicts without breaking anything? Any help would be appreciated thanks!

[julian]

Yes, sir. Sorry about that. I force-pushed when I really should've merged properly. My mistake.

Please run the following commands to get back on track:

$ git fetch
$ git checkout v0.7.x
$ git reset --hard origin/v0.7.x
$ ./nodebb upgrade

[SimonQ]

@julian When I run git checkout v0.7.x I receive the following:

Already on 'v0.7.x'
Your branch and 'origin/v0.7.x' have diverged,
and have 8 and 342 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

Is this normal?

[SimonQ]

@julian I ran ./nodebb upgrade right after and now am getting an error:

module.js:340
    throw err;
          ^
Error: Cannot find module 'colors'
    at Function.Module._resolveFilename (module.js:338:15)
    at Function.Module._load (module.js:280:25)
    at Module.require (module.js:364:17)
    at require (module.js:380:17)
    at Object.<anonymous> (/home/simonq/bbirdie/nodebb:3:14)
    at Module._compile (module.js:456:26)
    at Object.Module._extensions..js (module.js:474:10)
    at Module.load (module.js:356:32)
    at Function.Module._load (module.js:312:12)
    at Function.Module.runMain (module.js:497:10)

I'm not too sure where to go from here

[julian]

@SimonQ For now, just run npm install. Then hang on, let me re-launch v0.7.1 properly...

[julian]

Please follow my instructions here: https://community.nodebb.org/topic/6088/update-merge-issue/7

[SimonQ]

@julian Thanks! everything is great now!

Upon npm i I received this at the end

npm ERR! 
npm ERR! Additional logging details can be found in:
npm ERR!     /home/user/nodebb/npm-debug.log
npm ERR! not ok code 0

Is that normal?