What about svn conflicts?

This article mainly shows you "what to do with svn conflicts", which is easy to understand and clear. I hope it can help you solve your doubts. Let me lead you to study and learn this article "what to do with svn conflicts".

1. Right-click on the conflict file-edit conflicts- and manually modify the red area of the file conflict, other places can be ignored.

two。 Save after modification. Save both the local and svn files.

3. Then right-click on the conflicting file-resolved, click the 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 file. You have resolved the conflict, but you have not yet submitted the local file to svn. So now right-click on the file-update. If there are no errors, right-click on the file-commit. The latter operation will not be repeated.

5. It is only now that the modification of the conflict has been basically completed and submitted.

These are all the contents of the article "what to do with svn conflicts". Thank you for reading! I believe we all have a certain understanding, hope to share the content to help you, if you want to learn more knowledge, welcome to follow the industry information channel!