Svn incoming content cannot be updated, and submission error: svn: e155015: aborting commit: XXX remains in conflict

Details （ If you feel troublesome, you can directly look at the summary behind ）：

With colleagues svn Development projects , My colleague submitted some packages and classes that he wrote and tested but were irrelevant to the project , After I update his submission , I deleted packages and classes unrelated to the project and submitted （ step ： I am using idea, First, transfer packages and classes from project and local svn Delete above , And then submit , Select these deleted items in gray to submit ）, When my colleague updates my submission on his side , The problem is coming. ： Other submissions are updated , however idea In the version control tool of incoming Under the “ Delete useless packages ” The submission of has not been updated , And colleagues submit these again in svn When the package has been deleted on ,svn Report errors svn: E155015: Aborting commit: XXX remains in conflict,XXX Represents the submitted class . This is very confusing , Later, according to some methods of online search, there is no problem , Then my colleague and I began to delete his local package , Rewrite the package and class, and then operate , Still not done , Finally, I decided to change the package name, regardless of the problem that does not affect the project , After a while , Then go to my colleagues to see ,incoming Upper “ Delete useless packages ” The part to be updated is gone , Then change the package name back and submit it successfully , Then start combing this svn After deleting the file and submitting , The problem that others cannot update this part and submit something with the same name as the deleted part , Think about the problem , And reproduce this problem as you want , The problem is that I deleted the file and submitted it , Colleagues' local packages and classes have not been deleted , And he modified it , So when he updates my submission , My deletion of packages and classes does not cover those packages and classes that have been modified by him , So this part has been incoming Cannot be updated .

summary ：

A and B share svn When developing ,A and B Versions, , here A Deleted some （ Useless ） Package or class and submit it to the central repository ,
When B These have not been modified A When deleted packages and classes , You can directly update the central version Library A Submission of , To delete B Local useless packages and classes , Come and ** The central version library is consistent
When B Modify these locally A When deleted packages and classes , It will result in failure to update the central version Library A Submission of , also B Unable to submit these have been A Deleted packages and classes , And an error svn: E155015: Aborting commit: XXX remains in conflict, At this point, you need to first B Local modification withdrawal of （ Or version fallback ） To the initial state , Update again A Submission of .