Update Error

Dev Community Apps & Creations
1

Probably something very simple to fix but when i issue a 'git pull' for PlexConnect on my freeNAS server i get the following error. Anyone know how to fix as currently i delete the jail and do a fresh install which is a very long winded way to update.

root@PlexConnect:/PlexConnect # git pull                                        
remote: Counting objects: 40, done.                                             
remote: Compressing objects: 100% (30/30), done.                                
remote: Total 40 (delta 15), reused 24 (delta 10)                               
Unpacking objects: 100% (40/40), done.                                          
From https://github.com/iBaa/PlexConnect                                        
   ec6db32..0fd4b01  master     -> origin/master                                
Updating ec6db32..0fd4b01                                                       
error: Your local changes to the following files would be overwritten by merge: 
        assets/js/updateXML.js                                                  
        assets/locales/plexconnect.pot                                          
Please, commit your changes or stash them before you can merge.                 
Aborting
2

From the message it seems that you changed both updateXML.js and plexconnect.pot locally. Why?

The easiest might be to delete those files and try again...

3

Haven't changed either of those 2 files?

Just deleted and then it updated fine.

Thank you :)

4

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