Jump to content


  • Content Count

  • Joined

  • Last visited

Community Reputation

0 Neutral

About DanAvni

  • Rank
  1. DanAvni

    Merge anoyance with regions

    Hi I found this annoying thing about semantic merge. I am using VB.NET and I am trying to merge a unit test class. The collision I have is that the left side has added about 20 tests in a few regions and the right side has added 20 tests in a few regions. Although sematic merge does merge the code correctly, the regions are a mess after the merge. Tests from regions are moved to other regions on the conflict area and some of the regions from one of the sides are missing as their test methods have been moved to other regions in the code.