SVN commit: Solution to the remains in tree-conflict Error

When I submitted a new class package yesterday, an error occurred. I cannot submit the package several times.

Error: Aborting commit: 'C:/workspace/mywork/src/org 'remains in conflict

Because it was the first time that a new application was submitted, it seems that there was no problem. I finally found a solution on the Internet.

Solution in eclipse

Right-click the project directory-> Team-> Show Tree conflict-> A Tab View is displayed in eclpise to display the tree conflict content, right-click the conflict in the list one by one, mark it as resolved, and return to the project and submit the changes.

 

After reading this solution, I remembered that I submitted the org package before, but deleted the org package later.

Although deleted, it seems that there is still residual information left in the project.

 

Sometimes I think there is something strange. It's depressing. But I can still find the cause of the problem.

When I submitted a new class package yesterday, an error occurred. I cannot submit the package several times.

Error: Aborting commit: 'C:/workspace/mywork/src/org 'remains in conflict

Because it was the first time that a new application was submitted, it seems that there was no problem. I finally found a solution on the Internet.

Solution in eclipse

Right-click the project directory-> Team-> Show Tree conflict-> A Tab View is displayed in eclpise to display the tree conflict content, right-click the conflict in the list one by one, mark it as resolved, and return to the project and submit the changes.

 

After reading this solution, I remembered that I submitted the org package before, but deleted the org package later.

Although deleted, it seems that there is still residual information left in the project.

 

Sometimes I think there is something strange. It's depressing. But I can still find the cause of the problem.