From 27232c64227b2b6ea355789296ceaf67b5e7b746 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 28 Mar 2016 19:32:55 -0700 Subject: [PATCH] Update git instructions --- Frequently-Asked-Questions-(FAQ).md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Frequently-Asked-Questions-(FAQ).md b/Frequently-Asked-Questions-(FAQ).md index eb8bce0..a084497 100644 --- a/Frequently-Asked-Questions-(FAQ).md +++ b/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. #### Q: 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 +``` #### Q: 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.