Handle nil merge result in SquotPlaintextMapper

hpi-swa · Jul 10, 2024 · d548ca5 · d548ca5
1 parent e9f429a
commit d548ca5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Squot.package/SquotPlaintextMapper.class/instance/mergeVersion.into.withBase..st b/src/Squot.package/SquotPlaintextMapper.class/instance/mergeVersion.into.withBase..st
@@ -2,13 +2,14 @@ merging
 mergeVersion: right into: left withBase: base
 	| merged |
 	merged := self toPlaintext:
-					(SquotMergeUtilities
+					((SquotMergeUtilities
 						stringOrNilMergeLeft: left
 						right: right
 						base: base
 						ifConflict: [^ SquotPlaintextConflictChangeSet
 										withMapper: self
-										conflict: (SquotMergeConflict left: left right: right base: base)]).
+										conflict: (SquotMergeConflict left: left right: right base: base)])
+						ifNil: [^ nil]).
 	^ (merged squotEqual: left)
 		ifTrue: [SquotEmptyChangeSet withMapper: self]
 		ifFalse: [SquotPlaintextNormalChangeSet withMapper: self from: left to: merged]
diff --git a/src/Squot.package/SquotPlaintextMapper.class/methodProperties.json b/src/Squot.package/SquotPlaintextMapper.class/methodProperties.json
@@ -14,7 +14,7 @@
 		"importPriority" : "mad 4/22/2024 16:43",
 		"isSourceAt:timeStampOf:" : "mad 11/7/2023 14:42",
 		"isValidVersion:" : "mad 11/6/2023 13:22",
-		"mergeVersion:into:withBase:" : "mad 12/7/2023 14:14",
+		"mergeVersion:into:withBase:" : "mad 7/10/2024 17:08",
 		"pathFor:" : "mad 11/7/2023 14:42",
 		"printOn:" : "mad 11/7/2023 12:47",
 		"printWithoutPathOn:" : "mad 11/7/2023 12:47",