git - How to merge only a few change to another branch -
I cloned Moodle and I made local changes to customize the code. Now, I want to update to the latest version of Moodle (2.7) and I want to merge my changes. There are so many changes in Moodle, so I want to do it as much as possible. Therefore, by default, I want official version, except 4 files from Moodle repo. I have only 3 drawbacks in the previous version You want, "Take all these changes and pretend that they really This is committed, instead of " .