diff --git a/go/libraries/doltcore/sqle/dtables/status_ignored_table.go b/go/libraries/doltcore/sqle/dtables/status_ignored_table.go
index 402df8d980..eee59b8403 100644
--- a/go/libraries/doltcore/sqle/dtables/status_ignored_table.go
+++ b/go/libraries/doltcore/sqle/dtables/status_ignored_table.go
@@ -147,7 +147,8 @@ func newStatusIgnoredItr(ctx *sql.Context, st *StatusIgnoredTable) (*StatusIgnor
 		if row.isStaged == byte(0) && row.status == newTableStatus && unstagedTableNames[row.tableName] {
 			tblNameObj := doltdb.TableName{Name: row.tableName}
 			result, err := ignorePatterns.IsTableNameIgnored(tblNameObj)
-			if err != nil {
+			// If a table name has conflicting ignore rules, don't ignore it.
+			if err != nil && doltdb.AsDoltIgnoreInConflict(err) == nil {
 				return nil, err
 			}
 			if result == doltdb.Ignore {
diff --git a/go/libraries/doltcore/sqle/dtables/unscoped_diff_table.go b/go/libraries/doltcore/sqle/dtables/unscoped_diff_table.go
index c730accc5a..2acad87a23 100644
--- a/go/libraries/doltcore/sqle/dtables/unscoped_diff_table.go
+++ b/go/libraries/doltcore/sqle/dtables/unscoped_diff_table.go
@@ -255,7 +255,8 @@ func (d *doltDiffWorkingSetRowItr) Next(ctx *sql.Context) (sql.Row, error) {
 		if changeSet == "WORKING" && tableDelta.IsAdd() {
 			tblName := doltdb.TableName{Name: tableDelta.CurName()}
 			result, err := d.ignorePatterns.IsTableNameIgnored(tblName)
-			if err != nil {
+			// If a table name has conflicting ignore rules, don't ignore it.
+			if err != nil && doltdb.AsDoltIgnoreInConflict(err) == nil {
 				return nil, err
 			}
 			if result == doltdb.Ignore {