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

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...