I know.

I verified that git does track line changes when deleting files, so it will definitely raise conflicts when I try to merge, but nothing should get lost.