by AL Rachels.
Hi Paul,
That very situation happened to me last Saturday. Git warned me that I had a file, one that I had hacked, that needed to be stashed or committed. I quickly looked up how to stash it and found links on how to do the stash and to put that file back after the git pull. I haven't actually tried to put the file back yet, as I did not really need the hack anymore after a plugin update, but you might want to try looking up how to do this.
Hope this helps,
AL