When using SVN, it is often the case that someone else commits and conflicts with the files I work on.
Let’s take a look at how easy it can be solved here.
When a collision occurs, Files with conflicting mine and revision numbers are created.
.mine = Current local file. original name = SVN file .revision number file = SVN different file. You might be see many file.
First, check the “Edit conflicts” menu to see how it changes.
You can see the three windows, and you can see the SVN file, My files, and the files below.
After the remainder of the file has been viewed and edited as the last file, pressing “Mark as resolved” will merge the files.
If the file is unrecognizable, such as a text file or source file, or if it is a nuisance, pressing Resolve will take precedence over the local file by default. When resolved, temporary files such as .mine, .r<revison> , .r<revision> The files are automatically deleted.