When a, svn up appears conflict xxxx (such as config)
Description xxx file there have been changes, and update files played down the conflict (ie changes in themselves and others to the same place)
Method One (small change when)
at this time to remove
mv xxx
then OUT the Check
svn CO svn: // ......
finally up
svn Update
Method Two (tricky, big changes and the need to retain traces of their own to change the time)
[ https://blog.csdn.net/lnazj/article/details/79691924 ]
Second, the difference with respect to the detection (check out) and export (export) of
1.checkout (detection): obtained from the server to the local equivalent. File acquisition is controlled
2.export (export): also will get the file locally. But the file is retrieved from version control