Jump to content

Merge anoyance with regions

Recommended Posts



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



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




Share this post

Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now