I am planning to use MPS to implement a DSL which will be used by a team working concurrently on the same project.
This obviously creates the potential for merge conflicts, as the same nodes might be edited by different users and then pushed to the repository.
We're used to resolving these types of issues when working in textual languages, but our MPS-based language will be new for us.
Which version control option is best for handling these types of conflicts with MPS? We've used git in the past.
Is there are risk of major errors (eg - irreversible reference-breaking) being introduced during such a merge?
Thanks for any advice.