1. Problem description
The project was pushed to the code cloud warehouse. After using svn to update and upload the code, I encountered a problem today. There was a .cs file. I accidentally removed it during the update, so I built another one afterwards. .Cs file with the same name, and then submit an error, I renamed its name, the result is still wrong, the specific error is as follows:
Cannot commit 'C:\Users\zy\Desktop\jiaxun\MvcApplication4\Helpers\SendSms.cs' because it was moved from 'C:\Users\zy\Desktop\jiaxun\MvcApplication4\Helpers\SMS.cs' which is not part of the commit; both sides of the move must be committed together
2. Solution
Simply submit the upper-level folder (parent directory). (My problem will be solved at this step)
If there is an error in the submission of the upper-level folder, it may be because there is an A file in svn, and you have renamed it to B file. The resulting conflict, the solution is
1. Go to svn and delete the A file, then submit the B file.
2. Directly select the project and submit it by svn team, it will automatically filter out the A file (the A file is preceded by a number, and the error is 100% when the resource library is synchronized because the file with the-number is not displayed)
reference:
https://blog.csdn.net/qq_38392542/article/details/85619204
