Simulink Project: Resolve Conflict Error

1 次查看（过去 30 天）
Alex
Alex 2013-3-20
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!

请先登录，再回答此问题。

采纳的回答

Tim Hosey
Tim Hosey 2013-5-23
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.

更多回答（0 个）

类别

在 Help Center 和 File Exchange 中查找有关 Project Management 的更多信息

标签

产品

Community Treasure Hunt

Find the treasures in MATLAB Central and discover how the community can help you!

Start Hunting!

Translated by