need to update the SmalltalkCISpec to use incoming version

dalehenrich · Dec 16, 2023 · b7f8ea4 · b7f8ea4
1 parent 07a7d64
commit b7f8ea4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -5,6 +5,7 @@ SmalltalkCISpec {
       #load : [ 'CI' ],
       #directory : 'repository',
       #onWarningLog : true,
+			#onConflict : #useIncoming,
       #platforms : [ #gemstone, #pharo ]
     }
   ],