Search found 2 matches

by ricard
Thu Dec 13, 2018 3:20 pm
Forum: General Questions
Topic: [Solved] How to merge with GIT two changed rximg from different branches
Replies: 2
Views: 1911

[Solved] How to merge with GIT two changed rximg from different branches

Hi!, as fas as I know, rximg files (autogenerated by Ranorex) are binary files. Ranorex magic merger is unable to merge this kind of files, as well as Git is also unable to do that. I have two branches where both rximg files have changed differently so, how can I merge these branches? If not, there ...