We will go back to the version list page of MergeTool and we will follow these steps:
- Click on the Merge Version action that can be found on the ribbon bar.
- Select OLDBASE in the Old Base field.
- Select NEWBASE in the New Base field.
- Select OLDCUSTOM in the Custom Version field.
- Write NEWCUSTOM in the New Custom Version field.
- Give this new version a description in the New Custom Version Description field.
- Put a check mark in the Skip if Manual Merge field. We select this option because on the first merge, we want MergeTool to automatically merge everything that can be merged without our intervention. In the second run, we will uncheck this option to deal with those changes that MergeTool cannot automatically deal with. ...