svn:Error: Aborting commit remains in conflict

created at 08-04-2021 views: 6


A folder was also deleted locally, and the corresponding folder on the server was deleted with svn's repo-brower. When submitting again, an error occurred: Aborting submission: ‘XXX’ still has conflict errors.


Right-click the project directory -> select TortoiseSVN->Revert, select the deleted folder in the window, and click OK to solve this problem.

created at:08-04-2021
edited at: 08-04-2021: