# Update Error

**URL:** <https://forums.plex.tv/t/update-error/69779>\
**Category:** Apps & Creations\
**Created:** [June 29, 2014, 3:27pm UTC](https://forums.plex.tv/t/update-error/69779 "2014-06-29T15:27:56Z")\
**Posts on this page:** 4\
**Page:** 1

<div class="post-metadata">

**Author:** ![lanky8804](https://sea1.discourse-cdn.com/plex/user_avatar/forums.plex.tv/lanky8804/32/87995_2.png) [@lanky8804](https://forums.plex.tv/u/lanky8804)\
**Post date:** [June 29, 2014, 3:27pm UTC](https://forums.plex.tv/t/update-error/69779/1 "2014-06-29T15:27:56Z")

</div>

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
```

---

<div class="post-metadata">

**Author:** ![baa](https://sea1.discourse-cdn.com/plex/user_avatar/forums.plex.tv/baa/32/2026_2.png) [@baa](https://forums.plex.tv/u/baa)\
**Post date:** [June 29, 2014, 4:57pm UTC](https://forums.plex.tv/t/update-error/69779/2 "2014-06-29T16:57:27Z")

</div>

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...

---

<div class="post-metadata">

**Author:** ![lanky8804](https://sea1.discourse-cdn.com/plex/user_avatar/forums.plex.tv/lanky8804/32/87995_2.png) [@lanky8804](https://forums.plex.tv/u/lanky8804)\
**Post date:** [June 29, 2014, 5:07pm UTC](https://forums.plex.tv/t/update-error/69779/3 "2014-06-29T17:07:41Z")

</div>

Haven't changed either of those 2 files?

Just deleted and then it updated fine.

Thank you :)

---

<div class="post-metadata">

**Author:** ![system](https://global.discourse-cdn.com/plex/original/3X/2/a/2acb9765406f63293d357b4ec509ec39aa28f2ad.png) [@system](https://forums.plex.tv/u/system)\
**Post date:** [December 21, 2019, 2:23am UTC](https://forums.plex.tv/t/update-error/69779/4 "2019-12-21T02:23:51Z")

</div>

Closed on December 21, 2019, 2:23am UTC

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