Ranorex Merger

Ranorex Spy, Recorder, and Studio.
nikolang
Posts: 7
Joined: Mon May 06, 2019 9:45 am

Ranorex Merger

Post by nikolang » Fri May 10, 2019 10:09 am

I use the ranorex merger in git but sometimes I get conflicts that i am unable to resolve manually without destroying the project. On my last merge I got 13 conflicted files even if the ranorex merger itself said that the merge was successful.

I do not have many options during merge so my simple question is: How can I merge without destroying my project? Are there any best practises/tools that I can use?

JohnTheTester
Posts: 4
Joined: Wed Apr 10, 2019 3:01 pm

Re: Ranorex Merger

Post by JohnTheTester » Fri May 10, 2019 2:30 pm

Can you give us a list of the "destroyed" files?