After updating our project to mendix 7, we cant update to teamserver anymore

We updated our project from Mendix 6.10 to Mendix 7, made changes and added new functionality. Now we're getting an error "conflict with file" whenever we press Team>Update and the error suggests to use tortoiseVPN. How do we solve this?
1 answers

The easiest solution is delete the project from your hard drive and download the project from the team server again.

The other suggested option is to download tortoisesvn from here be sure to downlaod the correct version.

Use the options of tortoise svn to resolve the conflict.