Ranorex Magic Merger

Ranorex Magic Merger helps you merge XML-based Ranorex files that are under source control. It can automatically merge compatible changes and helps you resolve conflicts manually when needed.

Ranorex Magic Merger supports the following file types:

• Ranorex test suite files .rxtst
• Ranorex repository files .rxrep
• Project files .csproj or .vbproj

Important: When a repository is merged, this also affects the automatically generated code files (.cs or .vb) associated with the repository. These files must be regenerated after the merge process for everything to work correctly. To do so, simply rebuild your solution in Ranorex Studio after the merge. Magic Merger will display a message with instructions if automatically generated code files are affected.

Ranorex Magic Merger is designed to be used as the default merge tool for supported Ranorex file types in your source control system.

The setup process depends on the source control system you use.

Git

When you open a solution that is under Git source control, or when you add a solution to Git, Ranorex Magic Merger displays a dialog asking whether you want to use it as the default merge tool for the supported Ranorex file types.

If you click Yes, Ranorex Studio configures everything automatically.

Note that this setting applies only to the current Git repository. Ranorex Magic Merger is not configured globally for all Git repositories.

Note: If you select Don’t use Ranorex Magic Merger and enable Do not show again, Ranorex Magic Merger will no longer be offered for new Git repositories. Repositories that already use it are not affected.
To restore the dialog, use Restore ignored dialogs in Settings.

SVN

You will need to manually set Ranorex Magic Merger as the default merging tool for the listed Ranorex file types in SVN.

For example, in TortoiseSVN:

1. Open the TortoiseSVN settings.
2. Go to External Programs > Merge Tools > Advanced.
3. Add the supported Ranorex file types.

4. Enter the following command line (Adjust if necessary)

   C:Program Files (x86)Ranorex 8.2BinRanorex.MagicMerger.exe -base:%base -mine:%mine -theirs:%theirs -output:%merged

TFVS

For TFVS, you must also configure Ranorex Magic Merger manually as the default merge tool for the supported file types.

Follow the setup instructions for your TFVS environment and add the supported Ranorex file types with the following command line (Adjust the path if necessary):

C:Program Files (x86)Ranorex 8.2BinRanorex.MagicMerger.exe -base:%3 -mine:%1 -theirs:%2 -output:%4

Use Ranorex Magic Merger locally

In some cases, you may want to run Magic Merger manually from the command line.

Use the executable with the required parameters (Adjust the path if necessary):

C:\Program Files (x86)\Ranorex 8.2\Bin\Ranorex.MagicMerger.exe -base:<basefile> -mine:<myfile> -theirs:<theirfile> -output:<outputfile>

The output file is generated as part of the merge process.

In most cases, Ranorex Magic Merger merges files automatically and then displays a message confirming that the merge was completed successfully.

If a conflict requires manual resolution, the merge screen opens.

Merge screen

The merge screen is available in Simple view and Expert view.

It provides the following information and options:

1. The conflict type and a short explanation.
2. Switch between Simple and Expert view. Expert view provides a more detailed tree structure.
3. Three available layouts for the current view.
4. The three file versions involved in the merge (Expert view only)
5. Tabs for navigating the hierarchy from the selected node onward. The node containing the conflict is highlighted in blue.
6. An option to open the file in Ranorex Test Suite Runner
7. A selector for the resolution strategy.

To resolve a conflict:

1. Review the conflicting changes.
2. Select the resolution strategy you want to apply.
3. Click Continue.

After all manual conflicts are resolved, a success message appears, and the merge is complete.