Post
by praveenadevi.B » Thu Jun 29, 2023 3:42 am
Hello odklizec,
Greetings of the day !...I'm also facing issue like this with Rxtst file.
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.