search

cydrobolt / polr

:aerial_tramway: A modern, powerful, and robust URL shortener
https://polrproject.org
GNU General Public License v2.0
4.98k stars 888 forks source link

Issues when updating #584

Open warinthestars opened 3 years ago

warinthestars commented 3 years ago

The update information doesn't list the location of the configuration files to backup prior to update. It would be nice to have a more comprehensive guide for what to backup.

I've made some configuration changes to some of the web page layout. Mainly providing information how to contact the owner of the instance.

To save those changes, I did a git commit and a git stash.

I then did a git pull to pull the latest version, which did pull the latest commit from the repo. Afterwards, I tried to git stash pop to apply my stashed changes to the latest pull. This broke stuff. I suspect I'm doing somthing incorrectly. Thankfully I took a snapshot before any changes were made.

Your Environment

Commit da35acba7 - May 23, 2018 Debian VM

cydrobolt commented 3 years ago

Did you run composer install after updating your instance? I'm not sure I could help you figure out why you're having a merge issue without knowing what specific files you modified. You should look in your repo and figure out if there are any merge conflicts. You could take a look at https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line if you're having merge conflicts in your repo. Otherwise, you could try git diff origin/master to see what files may be contributing to your issue.

The only files that are written locally after installation are .env (contains site settings) and MaxMind GeoIP data, neither of which are checked into git.