8852420..4397da1 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
i get this error... when i git pull
I don't know if my technique is the proper way but what I did:
Backed up my TPL files.
Deleted the 3 or 4 I had modified.
Copy the edited TPL files back in.
Unless they edit a TPL file in an update that shouldn't be an issue. If they do edit one, you will have to make your custom changes as necessary.