To describe the problem was encountered:
Server: items on a separate server for a file has been modified, and did not add this file
Warehouse: was wrong on github submitted twice
Local development environment: to github version conducted an updated version
Correction way:
The first local project backup!
Then the local version of the project back to back, fall back to the correct version
Then, forced warehouse code covering
I use the first approach, it has been determined that the correct version
All the above steps to restore the proper local warehouse and development environment
Then go to server restore, because I was very little changes to the server code, only one line. After changed, git pull, it really did not encounter the error.
With the new project and then back up data, move in the development environment, the normal submit.
Possible problems you encounter are not like me, but the problems encountered mainly about a solution to the idea, first of all want to back up, then that is considered part of the problem, and then choose one least-cost method of trial and error .
Encounter problems, do not be afraid to address, go to Baidu. As long as the step direction is right, one by one step.