Merge branch 'develop' into master

Author: j4yk

.squot

@@ -1,10 +1,10 @@
 OrderedDictionary {
-	'src\/VersionControl.package' : #SquotCypressCodeSerializer,
-	'src\/Pharo-compatibility.package' : #SquotCypressCodeSerializer,
-	'src\/Squot.package' : #SquotCypressCodeSerializer,
-	'src\/FileSystem-Git.package' : #SquotCypressCodeSerializer,
-	'src\/Squit.package' : #SquotCypressCodeSerializer,
-	'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer,
-	'src\/SquotTonel-Core.package' : #SquotCypressCodeSerializer,
-	'src\/SquotTonel-Tests.package' : #SquotCypressCodeSerializer
+	'src/VersionControl.package' : #SquotCypressCodeSerializer,
+	'src/Pharo-compatibility.package' : #SquotCypressCodeSerializer,
+	'src/Squot.package' : #SquotCypressCodeSerializer,
+	'src/FileSystem-Git.package' : #SquotCypressCodeSerializer,
+	'src/Squit.package' : #SquotCypressCodeSerializer,
+	'src/BaselineOfSquot.package' : #SquotCypressCodeSerializer,
+	'src/SquotTonel-Core.package' : #SquotCypressCodeSerializer,
+	'src/SquotTonel-Tests.package' : #SquotCypressCodeSerializer
 }

src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeWithAddedArtifactOnBothSides.st

@@ -24,6 +24,7 @@ testMergeWithAddedArtifactOnBothSides
 		self assert: merge hasConflicts.
 		(merge graphMerge conflictAt: (self workingCopy artifactAt: 'added') content startName) chooseIncoming.
 		request resume]
+	on: Warning do: [:e | e resume]
 	] valueSupplyingAnswers: {{'*'. #default}}.
 	self assert: #right equals: (self workingCopy objectAt: 'added') contents;
 		assert: rightName equals:

src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json

@@ -23,7 +23,7 @@
 		"testMergeSingleArtifact" : "jr 3/2/2020 23:35",
 		"testMergeTwoOrphanedVersions" : "jr 8/4/2019 00:35",
 		"testMergeVersionWithLoadedObjects" : "jr 3/2/2020 23:35",
-		"testMergeWithAddedArtifactOnBothSides" : "jr 3/2/2020 23:26",
+		"testMergeWithAddedArtifactOnBothSides" : "jr 8/11/2020 00:02",
 		"testMergeWithConflicts" : "jr 3/2/2020 23:01",
 		"testMergeWithConflictsChooseRemote" : "jr 3/2/2020 23:02",
 		"testMergeWithRemovedArtifactOnBothSides" : "jr 3/2/2020 23:25",