When running tests, on a load conflict, use the loaded version, other…

…wise Parasol gets replaced with the master version when building a branch
SeasideSt · May 17, 2023 · efcdaf1 · efcdaf1
1 parent 292bad6
commit efcdaf1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -4,7 +4,7 @@ SmalltalkCISpec {
       #baseline : 'Parasol',
       #directory : 'repository',
       #load : [ 'tests' ],
-      #onConflict : #useIncoming,
+      #onConflict : #useLoaded,
       #platforms : [ #pharo, #squeak, #gemstone ]
     }
   ],