News
The merging issue is fixed in MPS 2018.3.5
We identified an issue when merging branches. If a model was changed in 2 branches, the property changes were not taking effect when merging. This inconsistency is now solved with this newer version.
We have also solved some other minor bugs that we found recently, you can see the complete list of fixes here. Keep reporting any problems you find to our issue tracker.
Have a nice day!
Your JetBrains MPS Team