Merge SVN code: Merge the branch code to the trunk

1. Now the latest SVN code is in the workspace, and select the project -- Right-click -- team -- merge to enter the next page, as shown in figure

2. Click Next to enter the path of the branch to be synchronized to the local (that is, the trunk. You can select a folder for merging. The path corresponding to the branch is the path corresponding to the folder under the branch.

3. By default, next is used to process conflicting files later. Click Finish.

4. solution to the conflict file:

1. when there are few changes to the Branch file, set the locally merged conflict file to resolved (method: Right-click the selected file-team-mark as resolved ), overwrite the latest code of the trunk (method: Right-click the selected file-team-replacewith-the latest content in the repository), and copy the branch changes to the local file.

2. when many Branch files are changed and there are few changes to the master file, you can set the local conflict file to fixed, and then copy the changes to the master file to the Branch file, copy the Branch file and overwrite the main file.

3. there are many changes to the Branch file and there are too many changes to the trunk file. This requires flexible processing: First, check that the changes to the file are clear, it is the best way to copy the changed code to another file.

Note: When resolving conflicting files, use the tool software for comparison files: Beyond compare 3

Merge SVN code: Merge the branch code to the trunk