merge it locally first. The branch is base/master like this, and then the working add commit push prompts up-to-date to think that the file that has not changed the name of the checkout master branch disappears. Excuse me, how can I find these files?
solved, thank you! Reset is back
is gone is deleted by colleagues, and then push to remote, you merge natural files are gone. First take a look at the history of git to see who deleted it and why. If you delete it by mistake, you can find it with git checkout.
git log take a look at the log
then git reset-- hard log