Merge Version Changes

If you have used either the Switch Version or the Reverse Version Changes command, then you can use the Merge Version Changes command to re-introduce the changes from a specific version. You can also use this tool to merge other machine's local changes into a new deployed version.

For example, your version log includes the following changes:

1. Version 10 Added a page
2. Version 11 Added a tag
3. Version 12 Drew the tag on the page.

You decide that the creation of the page was a mistake, but that the creation of the tag was not. You can proceed as follows:

1. Select version 9 in the table.
2. Right-click to open the context menu.
3. Click Switch to This Version

Changes made in versions 10, 11 and 12 vanish from the current version.

4. Select version 11 in the table and right-click to open the menu.
5. Click Merge Version Changes.

The tag is again part of the current version. The page does not exist and the tag is not drawn on the non-existent page.

Depending on the change you may need to re-start your application.

For this example, the same effect could have been achieved by reversing the changes in versions 10 and 12.

 

Merge Version Range

If you made an earlier version current, or reversed version changes, you can merge selected changes from a range of versions into your current version.

The steps are identical to those when reversing a version range. The difference is only that selected changes are merged into the current version rather than reversed from it.

To merge a version range:

1. Right-click on a version marking the start of the range and select "Merge version range" from the menu.
2. Right-click on the version marking the end of the range and select "Merge version range end".
3. Optionally remove files from the list of changes that will be merged.
4. Click Apply and provide a comment in the dialog that appears.