Code merging of centralized version control tools

         Problem description ： I just started learning version control tools today , Its workflow is that people who work together connect to the server through the client , Take out the latest file , Work on , Then submit the update . If multiple people modify the same document at the same time , So what are the consequences , And how to merge files , Form the latest documents ？

        Consequences and merger rules ：

         If multiple people modify different lines of code in the same file at the same time , Then the version control tool will be submitted by the first person , Remind subsequent submitters to update documents , Otherwise, you can't submit , After updating the file, you can merge the modified file with the file in the Library , In this order , So the latest file finally obtained is the modified version of everyone .

         But if multiple people modify the same line of code in the same file at the same time or binary files that cannot be compared , Such as pictures and so on , It is easy to cause conflicts when submitting version control , Cause problems that cannot be submitted . At this time, after the first person submits the modified file to the Library , Subsequent submitters will also prompt to update the file , And can cause conflict , Only after the conflict is resolved according to the prompt can you continue to submit the Library , The latest file finally obtained is the conflict resolution version according to the last person who submitted the Library .

        Methods to resolve conflicts are not provided here , This article is only for understanding how to merge files when multiple people modify the same file at the same time in the centralized version control tool .

        SVN Reference links for conflict resolution methods ：

        SVN Solve the conflict _FameLee- The blog of -CSDN Blog _svn Resolve conflicts

        SVN How to resolve conflicts - Simple books (jianshu.com)