Always iam getting rxtst file issue after cloning issue

Ranorex Studio, Spy, Recorder, and Driver.
praveenadevi.B
Posts: 17
Joined: Wed Jan 18, 2023 1:25 pm

Always iam getting rxtst file issue after cloning issue

Post by praveenadevi.B » Sat Jan 28, 2023 2:30 am

Hi Team,
I'm a noobie with Azure devops.We do start working ranorex with azure devops.if we get conflicts need to open visual studio and resolving there.

i need to merge my branch with master on daily basis then it won't get conflicts right ,so that after mergering master in to my branch ,used to get conflicts so always i'm getting rxtst file issue(cloneing issue) ,can't load like that...i'm not getting why always getting this...tried with keeping master when trying to reslove conflicts time, even through getting error.

can you please some one here please.
show.PNG
If any tutorial available please give the URL ,i will go through...

Even through not i'm not sure is this correct process or not...please help me how to take update from master to my local branch regularly.

Regards,
Praveena
You do not have the required permissions to view the files attached to this post.

IvanF
Posts: 151
Joined: Thu Aug 11, 2022 8:55 pm

Re: Always iam getting rxtst file issue after cloning issue

Post by IvanF » Wed Feb 01, 2023 6:02 pm

You can try applying https://www.ranorex.com/help/latest/int ... ic-merger/ to troubleshoot the conflict.

Seems like competing changes happen in the same file at the same time. Maybe you could try merging into a different branch to see if the same issue persists. Other than that, this would have to be a direct support ticket with sharing more details about the files/conflict.

praveenadevi.B
Posts: 17
Joined: Wed Jan 18, 2023 1:25 pm

Re: Always iam getting rxtst file issue after cloning issue

Post by praveenadevi.B » Thu Jun 29, 2023 2:49 am

Hi Greetings of the day ! Thanks alot for your reply but still i'm facing same like above snip, i wanted explain when it is coming we are using GitTortoise now for git commands..i have created branch and completed my changes. Merge master in to my branch ,that time Ranorex magic merger came and resloved some conflicts and i prompt on finished button. After reload solution getting below error.(Rx.issue.png)

I went to git tortoise checking what is the conflict i,i understand CSProj file both recordings done same time in same file, so i resolved with use both of the files (used both code like master and my branch code also)and clicked on resolve conflicts...and not working again i tried with i copy and pasted CSProj from master in to my branch .even though no luck..

Please please help me here how can i resolve i struggle a lot with this always...again re doing all tc's and raising again PR...

Please help me please.
You do not have the required permissions to view the files attached to this post.

praveenadevi.B
Posts: 17
Joined: Wed Jan 18, 2023 1:25 pm

Re: Always iam getting rxtst file issue after cloning issue

Post by praveenadevi.B » Thu Jun 29, 2023 4:11 am

Show exception snip attached for your reference.
You do not have the required permissions to view the files attached to this post.