einzero Posted August 21, 2019 Report Share Posted August 21, 2019 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. Link to comment Share on other sites More sharing options...
calbzam Posted August 21, 2019 Report Share Posted August 21, 2019 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. Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
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 accountSign in
Already have an account? Sign in here.
Sign In Now