How to make git checkout except some folders?

Question

git

Good afternoon.
Some time ago, I made a git clone of a project from GitHub (Rails) to my VPS, after which I started using it. I made some changes to it that I needed (including language files). Now the author of the project has added some commits with bug fixes. How can I update my code without losing those edits in language files and other places?
Thanks

Answer 1

git pull --rebase
Edits will not be lost. They may have to be merged in heavily modified files. Simple cases git resolves quite well.

Answer 2

git merge
git-scm.com/book/ru/v1/%D0%92%D0%B5%D1%82%D0%B2%D0...