Git merge strategy to ignore deleted files

Question

I have special branch (release branch) which is an exact copy of master branch with some files and directories removed. No development is happening on this branch, however i

Answer 1

git merge master
git status --porcelain | awk '{if ($1=="DU") print $2}' | xargs git rm
git commit