How to prevent git merge upstream to delete files

Question

I forked a project which has a specific folder. (app/themes/theme_name)

Since, the folder was deleted from the main repository.

I need to preserve the folder in my current project (cause I am still working on it). Basically I want to be able to merge my upstream without deleting files I'm still using.

One solution would be to rename files but I think it will loose the history.

Is there another solution? Thanks

• update : merge not fetch

Answer 1

If git's merge does almost exactly what you want, often the best way to get exactly what you want is to run it --no-commit and fix up the result manually:

git merge --no-commit
git checkout HEAD -- app/themes/theme_name
git commit

Nothing says you have to use git's default merge driver at all, and git's built so its merge cooperates very well with usage like this.

Answer 2

使这些文件不被git跟踪

git rm --cached filename