Jump to content
Sign in to follow this  
einzero

How to set text merge as default merge tool instead of semantic merge?

Recommended Posts

Hello,  I have a question again :)

After 8.0.16.3339, semantic merge is default merge tool for .cs files.
However, sometimes semantic merge worked very weired with some auto generated cs files.
(Those .cs files were conflcted in semantic merge tool, but not conflicted in legacy text merge tool)

So, I like to use old legacy text merge as default merge tool, but I can't find any option about that.
Currently,  I always run text merge after semantic merge runs first, and it was very cumbersome.

I hope there is a good way to solve this problem.

Thanks for reading my question.

Share this post


Link to post
Share on other sites

Hi,

If you configure "mergetool" to be run for a specific file type (eg: .cs), it will be run (and not the semantic merge tool). Currently, the semantic merge tool is the default for generic text files.

image.png

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...
Sign in to follow this  

×
×
  • Create New...