Cant update to new version

Dev Community Apps & Creations
1

When trying to update via git pull I am getting the following can anyone assist please: 

 

 

root@PlexMediaCenter:/home/alancarslaw/Library/Application Support/PlexConnect# git pull
remote: Counting objects: 118, done.
remote: Compressing objects: 100% (62/62), done.
remote: Total 100 (delta 65), reused 70 (delta 35)
Receiving objects: 100% (100/100), 12.10 KiB, done.
Resolving deltas: 100% (65/65), completed with 18 local objects.
   7fd1979..573b7ba  XML_templates -> origin/XML_templates
 * [new branch]      v0.1-iOS-pre5.1 -> origin/v0.1-iOS-pre5.1
 * [new branch]      version_check -> origin/version_check
Updating 2203294..573b7ba
error: Your local changes to the following files would be overwritten by merge:
Settings.py
Please, commit your changes or stash them before you can merge.
Aborting
root@PlexMediaCenter:/home/alancarslaw/Library/Application Support/PlexConnect# git commit
# On branch XML_templates
# Your branch is behind 'origin/XML_templates' by 19 commits, and can be fast-forwarded.
#
# Changes not staged for commit:
#   (use "git add ..." to update what will be committed)
#   (use "git checkout -- ..." to discard changes in working directory)
#
# modified:   Settings.py
#
no changes added to commit (use "git add" and/or "git commit -a")
root@PlexMediaCenter:/home/alancarslaw/Library/Application Support/PlexConnect# 
2

Well. Guess you did some changes to settings.py before. Git is cautious and don't want to overwrite your modifications...

Proposal as noted up there: "stash them" (ie. those changed files)

3

Baa, I have always modified Settings.py its where I defined my ip_pms and ip_dnsmaster - should I not have modified this file? What is the best way to resolve this issue and bring in new updated version? 

4

Think I have sorted it and now updated to new version: 

root@PlexMediaCenter:/home/alancarslaw/Library/Application Support/PlexConnect# git stash

root@PlexMediaCenter:/home/alancarslaw/Library/Application Support/PlexConnect# git pull
Updating 2203294..573b7ba
Fast-forward
 ATVSettings.py                      |    2 +-
 DNSServer.py                        |   64 +++++++++++++++---------------
 Debug.py                            |    3 +-
 PlexConnect.py                      |   26 ++++++------
 PlexGDM.py                          |    9 ++---
 README.md                           |   20 ++++++----
 Settings.py                         |    6 ++-
 WebServer.py                        |   40 ++++++++++---------
 XMLConverter.py                     |   15 +++++--
 assets/scrobble.js                  |   74 ++++++++++++++++++++++++++++++++++-
 assets/selectAudioAndSubs.js        |   60 ++++++++++++++++++++--------
 assets/templates/ByFolder.xml       |   12 ++++--
 assets/templates/Channels.xml       |   12 +++---
 assets/templates/EpisodePrePlay.xml |   15 +------
 assets/templates/MoviePrePlay.xml   |   13 +-----
 assets/templates/Photo.xml          |    2 +-
 assets/templates/TV_OnDeck.xml      |    1 -
 17 files changed, 236 insertions(+), 138 deletions(-)
root@PlexMediaCenter:/home/alancarslaw/Library/Application Support/PlexConnect# 
5

No, you should NOT modify settings.py.

Once PlexConnect is running btw made a nice shutdown, you should find a file called "Settings.cfg". This should take your changes. The need for editing source code was removed maybe two weeks ago...