How to solve svn conflict problem

SVN is the abbreviation of Subversion. It is an open source version control system. Compared with RCS and CVS, it adopts the branch management system. Its design goal is to replace CVS. Many version control services on the Internet have migrated from CVS to Subversion. To put it simply, SVN is used for multiple people to jointly develop the same project and share resources. This article is a detailed analysis and introduction to the solution to svn conflicts. Friends who need it can refer to it

1. Right-click on the conflict file----edit conflicts-- ---Then manually modify the red areas where the files conflict, and leave other areas alone.

2. Save after modification. Save the files locally and in svn.

3. Right-click on the conflicting file -----resolved, click on the corresponding file in the pop-up window and click OK.

4. Note that the submission was not successful at this time. At this time it just means that you have made the two versions of the files consistent. You have resolved the conflict, but you have not yet submitted the local files to svn. So, now right-click on the file----update. If there are no errors, right-click on the file -----commit. This subsequent operation will not be described in detail.

5. Now the conflict modification has been basically completed and submitted.

The above is the detailed content of How to solve svn conflict problem. For more information, please follow other related articles on the PHP Chinese website!