one or more files are conflicted. Please use an external tool to resolve these conflicts.

0
Hi, is there anyone can help or let me know what kind of external tool that used to resolve the conflicts? 
asked
1 answers
3

You can use TortoiseSVN to resolve file conflicts as described here: https://docs.mendix.com/refguide/using-version-control-in-studio-pro#9-working-outside-studio-pro

answered