JetBrains MPS with Git

When using JetBrains MPS with Git, be mindful of its model-based storage, which generates numerous XML and binary files that can lead to complex merge conflicts. Always configure .gitignore properly to exclude derived files and use MPS’s built-in merge and model checking tools to resolve conflicts safely. Ensure all team members use the same MPS version to avoid compatibility issues, and commit changes frequently to prevent large, hard-to-merge updates.

A properly formated .gitignore can be found here:

workspace.xml
junitvmwatcher*.properties
build.properties
junitvmwatcher*.properties
build.properties

# generated java classes and java source files
#   manually add any custom artifacts that can't be generated from the models
classes_gen
source_gen
source_gen.caches

# generated test code and test results
test_gen
test_gen.caches
TEST-*.xml
junit*.properties