Magic merge kills the repository

Ranorex Studio, Spy, Recorder, and Driver.
kuzma.molchanov
Posts: 2
Joined: Wed Oct 21, 2020 7:16 am

Magic merge kills the repository

Post by kuzma.molchanov » Tue Jun 01, 2021 10:52 am

hello, I have a problem with merging branches.
preconditions:
Ranorex 9.3.4,
-2 people simultaneously branched off from the general development branch
-each creates several test cases
problem:
When merging two branches branchA and branchB (GIT), magic merge reports that the merge completed without errors, however, when rebuilding the project, ranorex displays errors
The "MasterRepositoryFolders.VnaNGAppFolder" type already contains a definition for the "ListContentListView". (CS0102)
I translated the error text
Screenshot_240.png
It turns out that 2 identical items are created in the repository
How to solve this problem?
You do not have the required permissions to view the files attached to this post.

User avatar
odklizec
Ranorex Guru
Ranorex Guru
Posts: 7470
Joined: Mon Aug 13, 2012 9:54 am
Location: Zilina, Slovakia

Re: Magic merge kills the repository

Post by odklizec » Fri Jun 04, 2021 6:25 am

Hi,

In my opinion, it's a bad merge caused by incorrect merge process. Have you "manually" reviewed each single conflict Magic Merger most probably suggested? You see, Magic Merger is a handy tool, but not a magic wand, which solves all conflicts automatically! So in many cases, especially in multi-user environment, it's required to setup certain workflow processes how to perform pull, merge and push of code. Ideally, there should be still one person who reviews all conflicts.
Pavel Kudrys
Ranorex explorer at Descartes Systems

Please add these details to your questions:
  • Ranorex Snapshot. Learn how to create one >here<
  • Ranorex xPath of problematic element(s)
  • Ranorex version
  • OS version
  • HW configuration

User avatar
doke
Posts: 112
Joined: Fri Mar 29, 2019 2:33 pm

Re: Magic merge kills the repository

Post by doke » Tue Jun 08, 2021 4:31 pm

Hi,
Did you rebase branch B on master after merging branch A in the master ?