Node remains in conflict, svn shows conflict on server

symptom:

After the index page is modified and a title is submitted to svn, there is no error or conflict, but when accessing online, it is found that it has not changed.... Embarrassing, delete the upload, delete it, check it out again, and upload it again. . . . It doesn't work at all. .



Solution:
After various searches, the methods given are not feasible, and later found that stackoverflow is more diao

svn revert --depth=infinity index.html

The index.html here is a conflicting file. Friends who encounter similar problems can just change this to the file name of their own svn prompting conflict. If this method does not work, you can try to change index.html (that is, the name of the conflicting file) to the name of the folder where the conflicting file is located


Source: https://segmentfault.com/a/1190000010636783


Guess you like

Origin http://43.154.161.224:23101/article/api/json?id=325524398&siteId=291194637