mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-05 00:44:00 -06:00
Code Issues Packages Projects Releases 142 Wiki Activity

Merge pull request #2689 from alrs/doltcore-merge-err

Browse Source 
libraries/doltcore/merge: fix dropped error
This commit is contained in:
Tim Sehn
2022-01-28 15:10:42 -08:00
committed by GitHub
parent bb0ef5f858 3296b9e4df
commit f8f056ee62
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go/libraries/doltcore/merge/constraint_violations.go
View File

@@ -212,6 +212,9 @@ func parentFkConstraintViolations(
}
return false, nil
}()
if err != nil {
return nil, false, err
}
if shouldContinue {
continue
}