SVN issue sorting submission failed (svn:Aborting commit: 'xxxx project file' remains in conflict)

Problem description: I created several new files, and after the development was completed, when I was about to upload them to svn, I waited for a long time (the company network was not good), and finally it was prompted that the connection had timed out. Then I clicked Submit and this problem occurred. The newly created files have all become conflict files (with yellow exclamation marks).
Solution: Find the project file storage location, right-click the conflicting file, select TortoiseSVN and then select [Resolve] (English resolve) and then it's done

Guess you like

Origin blog.csdn.net/Zhang_YingJie/article/details/90640536