Merge remote-tracking branch 'upstream/main' into unit-tests-reforcexy

# Conflicts:
#	README.md

diff --cc README.md
index b5c0af0af7218ab976a8e2f4f2c83dc5a8fc995a,6e2c31ae19c2198707c28133b9983eaab9003b76..4f8a661b49fa21586e56e9b996fd3c09a4ac1bd2
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -582,14 -548,11 +582,27 @@@ placeholder, a missing or undated measu
  the floor it justifies, a floor below the current minimum, a floor that is not a
  percentage, a `precision` coarse enough to round the total past the floor, a
  disabled branch trace, a disabled namespace walk, a source tree that is not the
++<<<<<<< HEAD
 +measured one, a `fail_under` that has drifted into the inert `[run]` section, any
 +`omit`, `include`, `exclude_lines`, `exclude_also`, `patch` or `partial_*` under
 +either section, and a misspelled option. `ReforceXY`'s guard is the stricter of
 +the two: it also rejects a second measurement root (`source_pkgs`, `source_dirs`,
 +`plugins`) and pins that no statement or branch leaves the denominator through
 +coverage's default exclusions — the statement-level three and the branch-level
 +`# pragma: no branch` / `while True:` family — which it detects by parsing each
 +measured file twice, with and without `DEFAULT_EXCLUDE`. The shared `scripts/run-coverage.sh` runner is
++||||||| 062791f9
++measured one, a `fail_under` that has drifted into the inert `[run]` section, the
++three of coverage's default source exclusions, a coverage pragma in production
++source, and any `omit`, `include`, `exclude_lines`, `exclude_also` or
++`partial_*` of production code. The shared `scripts/run-coverage.sh` runner is
++=======
+ measured one, a `fail_under` that has drifted into the inert `[run]` section, the
+ source-level `no cover` or `no branch` pragmas (with or without a colon),
+ ellipsis-only bodies, additional `TYPE_CHECKING` blocks beyond the existing
+ import-only block, and any `omit`, `include`, `exclude_lines`, `exclude_also` or
+ `partial_*` of production code. The shared `scripts/run-coverage.sh` runner is
++>>>>>>> upstream/main
  exercised with real passing and failing coverage reports and a failing test suite;
  the checks assert process exit status, not workflow token spelling.