Simulink Project: Resolve Conflict Error

I've been playing around with Simulink Project with SVN integration to see if it has the capability to support our project management needs.

I have two separate sandboxes with the same project in them, committing to the same repository. When I commit changes from one sandbox to the repository to result in a conflict in the other sandbox, and I try to manually resolve the conflict by right-clicking and selecting "Mark Conflict Resolved", I get an error that says "Could not resolve conflict for file C:\blah blah blah."

Is there something obvious that I'm doing wrong? Or perhaps I'm missing a critical step?

Thanks!

Answer 1

[Tim Hosey]

Hi Alex,

This is known issue that will be fixed in 13b. A patch for older versions of MATLAB is available here: http://www.mathworks.co.uk/support/bugreports/details.html?rp=886973

The patch will prevent future unresolvable conflicts from occurring. To fix the existing conflict you will need to copy the file, to make a backup, then delete the conflicted file and update your sandbox.