Skip to content

Restore the blank-line separator lost when two PRs merged - #291

Merged
seanwevans merged 1 commit into
mainfrom
claude/fix-lint-merge-artifact
Aug 15, 2026
Merged

Restore the blank-line separator lost when two PRs merged#291
seanwevans merged 1 commit into
mainfrom
claude/fix-lint-merge-artifact

Conversation

@seanwevans

Copy link
Copy Markdown
Owner

main is currently red on the lint gate — this fixes it

PRs #285 and #286 both appended a new test section to the end of tests/test_process_backend.py. Each was correctly formatted on its own branch, but the textual merge joined the last function of one directly to the section comment of the other with one blank line where black wants two:

         assert sb.backend == "process"
+
+
 # -- guest environment scrubbing ------------------------------------------

Neither PR's CI could have caught this — the defect exists only in the merge result, not in either branch. It surfaced the moment the lint gate from #290 landed on main, which is that gate doing its job on its first run.

Two blank lines. Formatting only, no behavior change.

Verified against current main

pre-commit run --all-files (SKIP=pytest)  → isort/black/pylint/flake8/mypy all Passed
pytest -m "not soak"                       → 533 passed, 11 skipped

Generated by Claude Code

PRs #285 and #286 both appended a new test section to the end of
tests/test_process_backend.py. Each was correctly formatted on its own
branch, but the textual merge joined the last function of one directly to
the section comment of the other with a single blank line between them,
which black wants to be two.

Neither PR's CI could have caught this: the defect exists only in the
merge result, not in either branch. It surfaced immediately once the lint
gate from #290 landed on main, which is the gate doing its job on its
first run.

Formatting only; no behavior change. Suite: 533 passed, 11 skipped.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012ebvMQ3vLxdK3joymz6Feg
@seanwevans
seanwevans merged commit 64eb92a into main Aug 15, 2026
10 of 19 checks passed
@seanwevans
seanwevans deleted the claude/fix-lint-merge-artifact branch August 15, 2026 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants