About svn conflict resolution_PHP tutorial

1. Right-click on the conflict file----edit conflicts-----and then manually modify the red areas of file conflicts. You can 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 changed the two versions of the files to be consistent. You have resolved the conflict, but you have not yet submitted the local files to svn. So, now right-click the file----update. If there are no errors, right-click on the file -----commit. The subsequent operations will not be described again.

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

http://www.bkjia.com/PHPjc/327767.htmlwww.bkjia.comtruehttp: //www.bkjia.com/PHPjc/327767.htmlTechArticle1. Right-click on the conflict file----edit conflicts-----and then manually modify the file conflicts For red areas, you don’t need to worry about other areas. 2. Save after modification. Copy files both locally and in svn...