Merging repo and project files.

Ranorex Spy, Recorder, and Studio.
dmconsulting1
Posts: 91
Joined: Fri Nov 08, 2019 3:23 pm

Merging repo and project files.

Post by dmconsulting1 » Wed Mar 18, 2020 3:06 pm

So now we have more than one person working on this project and it seems almost every PR has conflicts with the repository and project due to minor changes. Is there an "easy" way to merge or rebase to resolve these? The repos I have been able to merge in studio, but the project files don't seem to work that way, or I can't seem to figure it out.

One PR got completed first and merged, now master is ahead of everyone on the csproj file.

User avatar
Vega
Certified Professional
Certified Professional
Posts: 222
Joined: Mon Jul 11, 2016 2:15 pm

Re: Merging repo and project files.

Post by Vega » Wed Mar 18, 2020 3:15 pm

Are you using the magic merger by chance?

https://www.ranorex.com/help/latest/int ... ic-merger/

Code: Select all

Ranorex Magic Merger makes it easy to auto-merge XML-based Ranorex files under source control and resolve manual conflicts on the fly.

It handles the following file types:

Ranorex test suite files .rxtst
Ranorex repository files .rxrep
Project files .csproj or .vbproj
hope this helps

dmconsulting1
Posts: 91
Joined: Fri Nov 08, 2019 3:23 pm

Re: Merging repo and project files.

Post by dmconsulting1 » Wed Mar 18, 2020 3:53 pm

No, I think there was talk about not wanting to use it for some reason. Should I try using it?

User avatar
Vega
Certified Professional
Certified Professional
Posts: 222
Joined: Mon Jul 11, 2016 2:15 pm

Re: Merging repo and project files.

Post by Vega » Wed Mar 18, 2020 5:11 pm

Since the magic merger does a lot of the work automatically without user interaction, I can't think of any reason not to use it.

If you are using source control, you are already using a generic merge tool. This is just specific to Ranorex files which the default merge tool may not know how to resolve as well as the Magic merger