Merge pull request #1487 from IETS3/bugfix/vcs_merge_hints_for_hash_property_1483

Add VCS merge hint for `__hash` property

Author: dbinkele

CHANGELOG.md

@@ -7,25 +7,27 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ## October 2025
 
+### Added
+- Variability: Some changes regarding variant configurations:
+  - A check has been added for duplicate names of configurations in the same container.
+  - Configurations might become inconsistent due to errors during manual conflict merges. A couple of model checks have been added to detect this. Additionally, there are quickfixes to fix such errors.
+  - The internal storage of configurations has changed, this requires a language migration. Note that after the execution of the migration, extended configurations must be adapted via intention to their changed base configuration.
+- A VCS merge hint has been added for the `__hash` property (e.g., for variant configurations). This avoids merge conflicts which cannot be resolved manually anyway (in those cases, the hash value has to be recomputed anyway).
+
 ### Fixed
 - Improved the readability of lists by enforcing a new line when a threshold of three elements per list is exeeded.
 
+
 ## September 2025
 
 ### Added
-- Variability: Some changes regarding variant configurations:
-  - A check has been added for duplicate names of configurations in the same container.
-  - Configurations might become inconsistent due to errors during manual conflict merges. A couple of model checks have been added to detect this. Additionally, there are quickfixes to fix such errors.
-  - The internal storage of configurations has changed, this requires a language migration. Note that after the execution of the migration, extended configurations must be adapted via intention to their changed base configuration.
+- Data tables, binary and multi-criteria decision tables now support deletion, copying and pasting when multiple cells are selected with the mouse.
 
 ### Fixed
 - The renderReadable/getPresentation implementations were improved and are now equivalent in all concepts.
 - Variability: For feature attributes, the inspector in the configuration editor shows the current value of the attribute and what caused this value (manual input by user, default, forced by tool, etc). This assignment cause is read-only now. An intention is added to manually set it to 'manual' state.
 - Variability: In the configuration editor, pressing Return/Enter anywhere will create an empty line after the configuration. Pressing Shift-Return/Enter on the header line of a configuration will create an empty line before the configuration.
 
-### Added
-
-- Data tables, binary and multi-criteria decision tables now support deletion, copying and pasting when multiple cells are selected with the mouse.
 
 ## July 2025
 

code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/org.iets3.core.base.vcs.mps

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:27cfda35-f088-4205-ba49-6d4b30b5dc77(org.iets3.core.base.vcs)">
+  <persistence version="9" />
+  <languages>
+    <use id="37e03aa1-7289-49bc-8269-30de5eceec76" name="jetbrains.mps.vcs.mergehints" version="2" />
+    <devkit ref="0f6bec2b-49d8-431a-a099-4c072ba32b8e(jetbrains.mps.devkit.aspect.vcs)" />
+  </languages>
+  <imports>
+    <import index="4kwy" ref="r:657c9fde-2f36-4e61-ae17-20f02b8630ad(org.iets3.core.base.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="37e03aa1-7289-49bc-8269-30de5eceec76" name="jetbrains.mps.vcs.mergehints">
+      <concept id="5705146868101871733" name="jetbrains.mps.vcs.mergehints.structure.FeatureVCSDescriptor" flags="ng" index="Zy3yG">
+        <child id="5705146868101924671" name="strategy" index="ZygvA" />
+      </concept>
+      <concept id="5705146868101872080" name="jetbrains.mps.vcs.mergehints.structure.PropertyVCSDescriptor" flags="ng" index="Zy3$9">
+        <reference id="5705146868101871735" name="prop" index="Zy3yI" />
+      </concept>
+      <concept id="5705146868101924608" name="jetbrains.mps.vcs.mergehints.structure.OursStrategy" flags="ng" index="Zygvp" />
+      <concept id="4140018591229954297" name="jetbrains.mps.vcs.mergehints.structure.VCSHints" flags="ng" index="1GGwg0">
+        <child id="4140018591229954298" name="concepts" index="1GGwg3" />
+      </concept>
+      <concept id="4140018591229954300" name="jetbrains.mps.vcs.mergehints.structure.ConceptVCSDescriptor" flags="ng" index="1GGwg5">
+        <reference id="4140018591229954485" name="cncpt" index="1GGwlc" />
+        <child id="5705146868101871817" name="features" index="Zy3wg" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1GGwg0" id="4FQsawJJshy">
+    <property role="TrG5h" value="IDetectNeedToRunManually_Hints" />
+    <property role="3GE5qa" value="adapter" />
+    <node concept="1GGwg5" id="4FQsawJJshz" role="1GGwg3">
+      <ref role="1GGwlc" to="4kwy:6MJy$PGsrHl" resolve="IDetectNeedToRunManually" />
+      <node concept="Zy3$9" id="4FQsawJJslc" role="Zy3wg">
+        <ref role="Zy3yI" to="4kwy:6MJy$PGsrHL" resolve="__hash" />
+        <node concept="Zygvp" id="4FQsawJJsle" role="ZygvA" />
+      </node>
+    </node>
+  </node>
+</model>
+

code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl

@@ -55,6 +55,7 @@
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
+    <language slang="l:37e03aa1-7289-49bc-8269-30de5eceec76:jetbrains.mps.vcs.mergehints" version="2" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />