diff options
| author | nemsia <nemsia@nemsia.org> | 2017-05-06 19:58:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-06 19:58:45 +0200 |
| commit | 133eeb1ceff07c323aeb1fdd795e37c5ce9ada5c (patch) | |
| tree | 25dbbe3f2b4059a6340b567796c14f0c65de41a1 | |
| parent | b25cc8f544457b6ea7eed56d30c211947b8baa12 (diff) | |
| download | mastodon_ynh-133eeb1ceff07c323aeb1fdd795e37c5ce9ada5c.tar.gz mastodon_ynh-133eeb1ceff07c323aeb1fdd795e37c5ce9ada5c.tar.bz2 mastodon_ynh-133eeb1ceff07c323aeb1fdd795e37c5ce9ada5c.zip | |
[fix] Upgrade from 1.3.3
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
....
| -rw-r--r-- | scripts/upgrade | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/upgrade b/scripts/upgrade index ab4bf58..672900f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,6 +41,7 @@ sudo systemctl stop mastodon-*.service sudo su - $app <<PULLCOMMANDS pushd ~/live git fetch +git reset --hard origin/master git pull https://github.com/tootsuite/mastodon.git master PULLCOMMANDS |