Update PlexConnect issue :(

Hi PlexCommunity,

 

I have a problem when i try to update my PlexConnect Folder?

 

Last login: Wed Feb  5 16:10:56 on ttys001

ives-macmini:Plexify iveflammang$ git pull

Updating e5d9ea6..3df7252

error: Your local changes to the following files would be overwritten by merge:

Settings.py

assets/js/application.js

assets/js/utils.js

assets/templates/Show_Grid.xml

assets/templates/Show_List.xml

support/OSX/createcert.bash

Please, commit your changes or stash them before you can merge.

Aborting

ives-macmini:Plexify iveflammang$

 

What am i doing wrong?

 

Thx for any help:)

Well, you changed a couple of source files...

github is warning you, that you would loose your work if it just overwrites them. I guess you somehow have to discard (stash?) those changes, before re-trying.

Well, you changed a couple of source files...

github is warning you, that you would loose your work if it just overwrites them. I guess you somehow have to discard (stash?) those changes, before re-trying.

Yes, I changed the Webserver.py to get the Plex Icon on iMovie Theater. 

so now i can't update anymore?

How do i have to discard this settings, to get my folder updated with the last Plexconnect version?

Or do i have to stay with?

thx Plex Star

You no longer have to edit Webserver.py to use iMovie Theatre. You just edit the hosttointercept in Settings.cfg.

I meant that i changes the webserver.py to get a Plex Icon instead of trailers or imovie icon?


Sry for my bad english ;(

undo the changes as you only need them for the install.

it does look like you changed more than that though

I meant that i changes the webserver.py to get a Plex Icon instead of trailers or imovie icon?

Sry for my bad english ;(


Nah, my fault, I just misread.

This topic was automatically closed 90 days after the last reply. New replies are no longer allowed.