Jump to content
johndog

C# methods moved to a different file were detected as change/delete conflict

Recommended Posts

I had a situation where a large file had a class with many methods in it.  In one branch these methods were changed slightly, and in another the methods were extracted into new class and .cs file.  When these branches were merged, SemanticMerge simply presented this as a conflict with a "change" on their side, and a "delete" on your side, and seemed to ignore the fact that the same methods existed in another added file, so it should have represented a move, not a delete.

 

Is there a trick to having SemanticMerge analyze the whole change for moves between files?

 

 

 

Share this post


Link to post
Share on other sites

Hi,

 

Sorry, You are  explaining a multi file scenario and I´m afraid that Semantic Merge is not able to handle it. We are working on supporting the multi file merge scenarios in the near future :)

 

Regards,

Carlos.

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

×