How to avoid Git merge conflict after several relocations of a file?

Question

When I'm trying to merge Git says:

foo.txt deleted in HEAD and modified in release

Actually, I didn't delete foo.txt in my branch, but moved it to a new place, a few times. I suspect that Git lost this multiple movement information and now thinks that I deleted the file and created a new one somewhere else.

Can I somehow inform Git where the file is located now?

Answer 1

This is how I solved the problem:

git rebase

I applied all my changes to the master branch, one by one, resolving conflicts incrementally.