I have two branches: master and feature
I have to merge the feature branch into the master.
Both branches have a few new commits.
Now I am checking out the master branch and merging the feature branch to the master.
The new files in the master but not in the feature branch are showing as deleted.
can someone please help to merge these branches.
when I execute git status, I can see few files are modified, few have merge conflict, and many are in deleted state.

The situation is like this：
A branch called master, another branch called dev, last branch called feature.