The following information is displayed when merging:
Working copy and merge source not ready for reintegration
svn: Reintegrate can only be used if revisions 6129 through 8011 were previously merged from svn://x.x.x.x/sms/client to the reintegrate source, but this is not the case:
sms/branch/agent/client
Missing ranges: /sms/client:7656,7837,7861,7988
Solution steps:
1. Right-click the branch project's "team" > "Set Properties"
2. Enter the value shown in the figure below in the opened window. The svn path in the text attribute is the trunk path, and the version number is filled in and an error message is displayed. After entering and saving, submit the branch project to svn again.
3. After completing the first and second steps, there will be no error in re-executing the merge on the main project.