ECLIPSE_SVN file conflicts, marked as merged

1. Background
The company uses Eclipse SVN for team development, but in development I and my colleagues (Code T) have changed the same version number of the file (code f), assuming this version number is 6 (can be regarded as F6), then colleague T submitted his modified version (F7), That is, F6 is covered by F7 in the repository. At this point, you happen to have also made changes to the file F6, which will cause a file conflict after synchronizing the repository.

2. Solution _a
If my colleague and I are not changing the same location in this file, then SVN will merge your changes.
Steps:
<1> then we click "Update" directly to update the changes on the server to local.
<2> Click "Submit" to upload your merged files to the server.

3. Solution _b
If in this file, my colleague and I change the same place, we can make a choice, keep the colleague's F7 or keep our F7.
Steps:
<1> choose to discard your changes. Select overwrite/update in the context menu, and then eclipse asks if you want to delete the local changes and replace them with the files in the repository. "Click Yes to".
<2> choose to keep your changes. Submit directly, overwriting your colleague's changes, and be cautious.

4. Solution _c-marked as merged
This solution can be used when we modify the file F7 of the location and colleagues uploaded to the repository, each with a choice.

Steps:
<1> mark the conflict file as merged, then edit the local file F7, there are two button functions available, use the following figure.
<2> after editing, click "Update" to upload the local file F7 to the repository.