search

mattermost / mattermost-docker

Deprecated
Apache License 2.0
964 stars 575 forks source link

Updating to the Latest Version #505

Closed nickian closed 4 years ago

nickian commented 4 years ago

I was able to update my instance, but not with the directions provided. I had a quick question:

When I run git pull, I get this message:

error: Your local changes to the following files would be overwritten by merge:
    .travis.yml
    README.md
    app/Dockerfile
    db/Dockerfile
    web/mattermost-ssl
Please commit your changes or stash them before you merge.
Aborting

So, what I ended up doing was just cloning the repository to a new directory, matching the docker-compose.yml values that I needed, deleting the volumes folder from the new pull, then doing cp -r volumes from my old folder to my new one.

Is there an easier way to do this? Maybe this is a git question, not a Mattermost question, but I'm sure someone else will come across this. Thanks!

jgerstbe commented 4 years ago

If you did not modify these files yourself you can use git checkout <filename> to get the original file from your last state of the repo. After that git pull should work just fine.

nickian commented 4 years ago

Ok, thanks! I will try that next time.