Jump to content
DanAvni

Merge anoyance with regions

Recommended Posts

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.

 

 

 

 

Share this post


Link to post
Share on other sites

Hi,

 

Could you send us the involved files in the merge (or a simplified version) in order to reprodcue the issue?   support at codicesoftware dot com

 

Regards,

Carlos

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

×
×
  • Create New...