Using Magic Merger locally

[cpalex]

I have several "branches" of our automation that are actually SVN copies, so the typical merge does not work.

I can make local merging work, but I cannot for the life of me get the magic merger to run locally. It just complains that it needs parameters.

The expected format is published as this:

Code: Select all

Ranorex.MagicMerger.exe -base:<Base File> -mine:<My File> -theirs:<Their File> -output:<Outptut File> [-help]

And the two files I am trying to merge are located here:

This would be "mine":

Code: Select all

C:\Users\Alex\Documents\Ranorex\RanorexStudio Projects\build89\RegressionSuite\CMWRepository.rxrep

And this one is "theirs":

Code: Select all

C:\Users\Alex\Documents\Ranorex\RanorexStudio Projects\build88\RegressionSuite\CMWRepository.rxrep

So could someone please help me with the exact command line call I would need to merge these two files??

[Support Team]

Hello cpalex,

It seems you didn't specify the base file which represents the oldest version of a file, from where You and They start making changes.
That means you have to specify three files in your command (-base:<Base File> -mine:<My File> -theirs:<Their File>)

If it still doesn't work, please provide the error message you get from the merger tool.

Regards,
Bernhard