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?
Ranorex Merger
-
- Posts: 4
- Joined: Wed Apr 10, 2019 3:01 pm
Re: Ranorex Merger
Can you give us a list of the "destroyed" files?