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]
This would be "mine":
Code: Select all
C:\Users\Alex\Documents\Ranorex\RanorexStudio Projects\build89\RegressionSuite\CMWRepository.rxrep
Code: Select all
C:\Users\Alex\Documents\Ranorex\RanorexStudio Projects\build88\RegressionSuite\CMWRepository.rxrep