Ranorex Forum

hello
im currently have a problem with the ranorex magic merger.
Were currently using git.
Lets say i have branch "Test" with changes in file b.
Then i have a integration branch "Integration" with new files c,d,e,f
When i now rebase the branch "integration" in git against "test" the following happen.

The magic merger appears telling me that it successfully merged. It does this three times. Probably for
Ranorex test suite files .rxtst
Ranorex repository files .rxrep
Project files .csproj
. SO fine so good. I needed to resolve some conflicts but none are related to recordings.
What now happens is that all files i added for the "integration" branch are gone.
If i do it the other way round i keep all the files but i loose the changes i did in file b.

So it looks like that the magic merge takes over all recording for the branch im merging against, removing or resetting the recording files for the branch im currently on.

Did i miss some settings despite the decision to use the tool after upgrading ?
I expected the tool to merge certain files during the integration process. But it looks like thats not what happened !

Hi fleipold,

I tried to replicate this:
1. Created new GIT repo, new project.
2. Created new branch named Integration
3. Checkout to new branch and add recordings c,e,d,f.
4. Created new branch named Test and checked out to there.
5. Did some changes to "Recording1" which was there by default.
6. Rebased from there to "Integration".

Everything looks all right. All the recording modules are there and the changes in Recording1 are still there. The thing is that MagicMerger should not come up at all if there are no merge conflicts. So, I suspect that there were merge conflicts and that the manual merges destroyed something.

Can you post the compressed Ranorex solutions for the Integration and Test branch as an attachment to your next reply and I can then try a rebase?

Regards,
McTurtle

good morning

Im not sure how the manual mergers should have destroyed the recordings. There were no conflicts of the files watched by the magic merger.
Is there a option to see what exactly the merger did ? Because currently for me thats kind of a black box. It says everything was merged and thats it.

Regards Florian

Hi fleipold,

You wrote in your previous email that you had to manually merge a few things, but that these were not related to recordings. What were they related to? Unfortunately, there is no logging or history where you could check what the tool did.

Can you replicate the same issue again? Can you post both branches with your next reply. Unfortunately, without some more information I will not be able to help.

Regards,
McTurtle

i got the merger working. It seems something with the branch went wrong. It would still be amazing if you could see what the merger actually did.
Thanks for your tries !