Update and commit problem

When I want to update I get this message: "The following files are conflicted: C:\Users\bas.van.der.sommen\Documents\Tricals-main_2\widgets\RichText.mpk" The RichText widget belongs to the Questionnaire app from the store. When I want to commit I get this message: "One or more files are conflicted. Please use TortoiseSVN to resolve these conflicts." How can I solve this problem? Thank you for the help. Kind regards, Bas
1 answers

Use the resolve conflicts option from tortoiseSVN in the directory where your project is located.