fix(docs): resolve coverage documentation merge conflict

diff --git a/README.md b/README.md
index 4f8a661b49fa21586e56e9b996fd3c09a4ac1bd2..88c4c46c6f39b6172ff71744fa5a4c0710674402 100644 (file)
--- a/README.md
+++ b/README.md
@@ -582,27 +582,15 @@ placeholder, a missing or undated measurement annotation, a measurement below
 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
+`partial_*` of production code. `ReforceXY`'s guard additionally rejects `patch`,
+misspelled options, and a second measurement root (`source_pkgs`, `source_dirs`,
+`plugins`). It detects default statement and branch exclusions by parsing each
+measured file twice, with and without coverage's defaults. The shared
+`scripts/run-coverage.sh` runner is
 exercised with real passing and failing coverage reports and a failing test suite;
 the checks assert process exit status, not workflow token spelling.