How to merge two branches?

Ranorex Spy, Recorder, and Studio.
boris0dev
Posts: 14
Joined: Fri Nov 09, 2018 11:28 am

How to merge two branches?

Post by boris0dev » Tue Jan 29, 2019 8:08 am

In the same repository I've created 2 branches.
What is the correct way to merge branch A into branch B?
I'm confused as I understand the Ranorex documentation this way that I should use Ranorex magic merger for the project files but I can't find a way to trigger it manually.
Do I merge the branches via Git manually and then magic merger pops up in Ranorex studio and merges the project files?
Thanks for any hint (before I really execute the merge via git and destroy everything :wink: )

User avatar
Vega
Posts: 129
Joined: Mon Jul 11, 2016 2:15 pm

Re: How to merge two branches?

Post by Vega » Tue Jan 29, 2019 7:32 pm

I believe the Magic Merger is for automatic resolution of merge conflicts only. If you want to merge two branches in a source control repository, you will need to do it on the source control level.
hope this helps

boris0dev
Posts: 14
Joined: Fri Nov 09, 2018 11:28 am

Re: How to merge two branches?

Post by boris0dev » Wed Jan 30, 2019 8:05 am

Thanks Vega.
Yes I've read the doc regarding the Magic Merger too.
But it seems that I can only pull from the same branch and in case of any conflicts the Magic Merger gets triggered. So for example if I develop on my design machine, make changes on the build server or remote agent and want to apply the changes on the design machine.
But this means it is not intended that multiple developers write their own test cases and Ranorex Studio is able to merge them .... :x
But thanks for your help anyway

User avatar
Vega
Posts: 129
Joined: Mon Jul 11, 2016 2:15 pm

Re: How to merge two branches?

Post by Vega » Wed Jan 30, 2019 9:35 pm

But this means it is not intended that multiple developers write their own test cases and Ranorex Studio is able to merge them .... :x
I believe this is exactly why the Magic Merger was created, so I apologize but I'm not quite sure where you are having trouble. There are certain files which are prone to merge conflicts, and the magic merger helps smooth this out for when you are working in teams.

There is a webinar which contains a live demo of the magic merger which may be helpful:

https://www.ranorex.com/automated-testi ... on-demand/

hope this helps