How to update in OS X Terminal with "git pull" command?

[alias_rex]

When I enter "git pull" in the Terminal, I get the following:

 

remote: Counting objects: 13, done.

remote: Compressing objects: 100% (1/1), done.

remote: Total 7 (delta 6), reused 7 (delta 6)

Unpacking objects: 100% (7/7), done.

From https://github.com/iBaa/PlexConnect

   f8d224b..8e3ee46  XML_templates -> origin/XML_templates

Updating f8d224b..8e3ee46

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

assets/templates/MoviePrePlay.xml

assets/templates/Search_Results.xml

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

Aborting

 

Do I have to temporarily remove the files that will be overwritten or is there a way "commit" my changes so the git pull update goes ahead? Or am I better of downloading the updates manually from the PlexConnect site.

[unisonruss]

Back up files you’ve updated, git pull, and replace files you’ve modified…just make sure the changes on GitHub are not done to files you’ve already modified, or else you may lose out on bug-fixes or new features.


It my be worth it to update, and then modify the new file with your IP again, that way you have all the changes.