Page 1 of 1

Ranorex Merger

Posted: Fri May 10, 2019 10:09 am
by nikolang
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?

Re: Ranorex Merger

Posted: Fri May 10, 2019 2:30 pm
by JohnTheTester
Can you give us a list of the "destroyed" files?