YunoHost-Apps/mastodon_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00
Code Issues Activity Actions

[fix] Upgrade from 1.3.3

Browse source 
Fix error: Your local changes to the following files would be overwritten by merge:
        .babelrc
        .dockerignore
        .editorconfig
        .env.production.sample
        .gitignore
        .rubocop.yml
        .travis.yml
        Capfile
        Dockerfile
        README.md
        Vagrantfile
        ....
This commit is contained in:
nemsia 2017-05-06 19:58:45 +02:00 committed by GitHub
parent b25cc8f544
commit 133eeb1cef
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/upgrade
View file

@ -41,6 +41,7 @@ sudo systemctl stop mastodon-*.service
sudo su - $app <<PULLCOMMANDS sudo su - $app <<PULLCOMMANDS
pushd ~/live pushd ~/live
git fetch git fetch
git reset --hard origin/master
git pull https://github.com/tootsuite/mastodon.git master git pull https://github.com/tootsuite/mastodon.git master
PULLCOMMANDS PULLCOMMANDS