Hello I have tried to apply the following commands from https://github.com/dreamfactorysoftware/dsp-core/wiki/Product-Upgrades
self-update is optional, try it if you get an error without it
…/…/…/php/bin/php …/…/…/php/bin/composer.phar self-update
…/…/…/php/bin/php …/…/…/php/bin/composer.phar update --no-dev
…/…/…/ctlscript.sh restart
based on this screenshot… what action should i take?
[This image is no longer available]
Also as I couldn’t get the follow command to work…
git stash
“/opt/bitnami/apps/dreamfactory/htdocs# git stash
/opt/bitnami/git/libexec/git-core//git-stash: 186: /opt/bitnami/git/libexec/git-core//git-stash: cannot create /opt/bitnami/apps/dreamfactory/htdocs/.git/logs/refs/stash: Directory nonexistent”
git checkout master
“/opt/bitnami/apps/dreamfactory/htdocs# git checkout mastererror: pathspec ‘master’ did not match any file(s) known to git.”
git pull origin master
"/opt/bitnami/apps/dreamfactory/htdocs# git pull origin master
From https://github.com/dreamfactorysoftware/dsp-core
- branch master -> FETCH_HEAD
Updating 92a81a6…efdf89a
error: Your local changes to the following files would be overwritten by merge:
composer.lock
Please, commit your changes or stash them before you can merge.
Aborting"