anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update git instructions

JonnyWong16
2016-03-28 19:32:55 -07:00
parent faba63f5ee
commit 27232c6422
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Frequently-Asked-Questions-(FAQ).md

@@ -66,7 +66,16 @@ Welcome to the PlexPy FAQ. Please note that most answers are not added yet. If y
**A:** Open PlexPy's config.ini with your preferred editor, search for `http_host` and `http_port` and remove everything after the equal sign for each entry. Then restart PlexPy and it will listen on the default IP address and standard port 8181.
#### <a name="general-q5">Q:</a> When I try to update PlexPy, it keeps telling me that "A newer version is available. You're XX commits behind."
**A:** Try run `git reset --hard HEAD` using the shell/command line first, then either update from the PlexPy interface or `git pull`.
**A:** The following only applies if you installed PlexPy using `git`. Stop PlexPy, then run the following commands from the command line/shell in the PlexPy folder.
```
git remote set-url origin https://github.com/drzoidberg33/plexpy.git
git fetch origin
git checkout master
git branch -u origin/master
git reset --hard origin/master
git pull
```
#### <a name="general-q6">Q:</a> When I try to update PlexPy, it keeps telling me "Please, commit your changes or stash them before you can merge."
**A:** See the answer to the previous question.