Differences between common updates and submissions in SVN

When the local file is not changed and the Server File is changed, the update will retrieve the file from the server and overwrite the current file.
If the local file is changed and the server file is not changed, the file will not be updated.
If the local file is changed and the Server File is changed, if the modified part does not conflict, the file will be merged to the local device. If there is a conflict, a file conflict will be prompted, you need to manually modify the settings and then upload them to the server.

The secret of SVN is that someone else has submitted the modified file. If you submit another file, it will not allow you to submit the modified file...

 

>>>>
<

Mark the conflicting region, delete the conflicting file, and keep the original file.

Synchronization refers to the work done before the update is submitted. synchronization is performed before the update is submitted to know what needs to be submitted and what needs to be updated, what conflicts occur (conflicts may occur if you and your colleagues modify the same file)

At this time, you can change the write to be consistent with the server file, and then submit and update the file.