Using Magic Merger locally
Posted: Tue Dec 03, 2019 8:44 pm
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:
And the two files I am trying to merge are located here:
This would be "mine":
And this one is "theirs":
So could someone please help me with the exact command line call I would need to merge these two files??
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