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

Ask general questions here.
ricard
Posts: 2
Joined: Thu Dec 13, 2018 3:12 pm

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

Post by ricard » Thu Dec 13, 2018 3:20 pm

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 is any workaround to solve this situation?

Thanks in advance.
Last edited by ricard on Mon Dec 17, 2018 8:43 am, edited 1 time in total.

User avatar
N612
Posts: 64
Joined: Mon Jul 11, 2016 4:01 pm

Re: How to merge with GIT two changed rximg from different branches

Post by N612 » Fri Dec 14, 2018 9:23 pm

I recommend adding *.rximg to your git ignore. While they are nice for visualizing the element when developing your test, they are not required and do not play nicely with source control tools. Note, the Ranorex Magic Merger is only enabled for the following file types: *.rxtst (Test Suite), *.rxrep (Repo), and *csproj (Project file).

ricard
Posts: 2
Joined: Thu Dec 13, 2018 3:12 pm

Re: How to merge with GIT two changed rximg from different branches

Post by ricard » Mon Dec 17, 2018 8:41 am

N612, I will definitely do that!
Thanks!