OK trying to upgrade from 7.1-7.2 and ruing into issues again.
I've tried a few of the things on line and rolled back my VM
With a working copy 7.1 I stopped nodebb, I want to run this step by step since i've run though a few things before and didn't work. SO I will wait between posts to make any changes.
thomasfraley@nodebb:~/nodebb$ git pull
remote: Counting objects: 568, done.
remote: Compressing objects: 100% (147/147), done.
remote: Total 568 (delta 388), reused 333 (delta 332), pack-reused 89
Receiving objects: 100% (568/568), 175.84 KiB | 0 bytes/s, done.
Resolving deltas: 100% (428/428), completed with 212 local objects.
- 8d786a1...56b79a9 v0.7.x -> origin/v0.7.x (forced update)
1a56267..47cc108 master -> origin/master
- [new branch] v0.8.x -> origin/v0.8.x
- [new tag] v0.7.2 -> v0.7.2
CONFLICT (content): Merge conflict in package.json
CONFLICT (add/add): Merge conflict in npm-shrinkwrap.json
Automatic merge failed; fix conflicts and then commit the result.