How can I prevent deleted file come back when merge branch on Git

Question

I have branch "develop_refactor", base on "develop" branch. In "develop_refactor", I deleted some file in "develop_refactor". Sometimes, I merge from "develop" to "develop_refactor" to update newest code from "develop". But deleted file is come back. I have to delete again. How can I prevent it return ?

Update:

Answer 1

For that reason, the proper way to keep a branch updated is through rebasing.

$ git rebase develop

This will replay all of develop_refactor's commits on top of develop's latest commits - thereby making sure the file is deleted every time.