libraries/doltcore/merge: fix dropped error

rmr1154 · Jan 26, 2022 · 3296b9e · 3296b9e
1 parent 425646f
commit 3296b9e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/go/libraries/doltcore/merge/constraint_violations.go b/go/libraries/doltcore/merge/constraint_violations.go
@@ -212,6 +212,9 @@ func parentFkConstraintViolations(
 				}
 				return false, nil
 			}()
+			if err != nil {
+				return nil, false, err
+			}
 			if shouldContinue {
 				continue
 			}