VCS Aspect¶ ⧉
The VCS merge aspect language aspect defines strategies to automatically resolve merge conflicts for nodes, their children, references, and properties.
— MPS documentation
I pulled some changes or made some other VCS-related stuff, and strange errors appeared, or changes weren’t visible.
There might be a bug related to caching or VCS in general. Invalidating the cache or restarting the project might help. There are quite some bugs in VCS ⧉.
How do you avoid merge conflicts?
Avoiding merge conflicts ⧉ (Specific Languages' blog)
What are some real-world use cases of merge hints?
- accepting our node when it contains a calculated hash or calculated result
- accepting our node for nodes where the graphical representation changed (e.g., diagrams)
- accepting our node when it contains additional information, such as node attributes
Last update:
July 16, 2023