Git merge says files were 'deleted by us' when they were not

Question

I'm new to git and am struggling with it a bit.

I was working on about 5 files and went to push them to my remote repo. I was expecting merge errors, but what came back was deleted by us message for 2 of the 5 files I was working on.

I most certainly did not delete these files, nor change their paths. Would anyone know why this has happened and what I can do about it?

git push ${repo_name} ${current_branch_refspec}
Push branch to remote

git merge ${current_branch_refspec}
Merging feature into testing branch

Answer 1

Add all files back and commit again.

git add .

or

git add -A

Then commit

git commit

If you want to remove files then you can use git rm instead of git add