More reliable merge conflict handling with the MPS merge driver.:
- Automatic merge of project and .msd/.mpl files.
- Merge The merge driver tries to leaves leave the models in the working directory in a readable state during conflict resolution
- Conflicted models are not cannot be opened from project tree in a normal way. When you first try to open a conflicted model you'll get , the merge dialog for this model will show up.
New Productivity Guide
Good command of the tools is undoubtedly one of the attributes of an efficient developer. MPS 2.5 can monitor your actions and give you statistics on how frequently you use its most prominent editing and refactoring capabilities. Go to Help | Productivity Guide to see how well you do: