Mendix Modeler Conflict error while committing the changes
We are working in a team for a project . We are working on mainline. After we make the changes , we try to update . It throws an error "An error occured while retrieving the latest changes from the repository". While committing , we get this error : "One or more files are conflicted. Please use TortoiseSVN to resolve these conflicts "
FNU Akshaya Ramamoorthi
You can use tortoise svn to resolve the conflict. Install version 1.7.15 (this is important). Once that is done installing you can right click the main folder for your project, go to the svn options and click check for modifications. Here you can see what is conflicted and if you want to resolve using your copy or their copy. Then I recommend committing the changes using svn.