Revert PR #7 — it merged a stale-base implementation that feat/work-modes already carries - #13
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #7 was opened from a worktree cut off
main, which trailedfeat/work-modesby 279 commits at the time. It therefore edited abin/perry-lintthat predated the task-store cutover and two later lint changes, and every measurement it reported was taken against that older binary. It was superseded by PR #9, which redid the same work on the correct base and is merged intofeat/work-modes.Merging #7 into
mainleft two different implementations of one feature, one on each branch:NS-01occurrences inbin/perry-lintmain(PR #7)feat/work-modes(PR #9)They differ by 2,311 lines and a test-merge produced 4 conflict blocks. The hazard is not the conflict — it is that the conflict is semantic. A merge that resolves it textually can leave both implementations in place, and no test in either branch asserts there is only one.
What this does
Reverts the merge commit with
-m 1, keepingmain's side. Verified:bin/perry-lintis now byte-identical tof3c6712, its state before feat(namespace): default lint emits NS-01, as DESIGN-002 decision 4 says it does #7.feat/work-modesinto this branch produces 0 conflict blocks, down from 4.The feature is not lost.
feat/work-modescarries PR #9, the version built on the current tree, withtests/test_ns_collision.py(34 tests) and byte-identity verified head-to-head against the pre-change binary on four project/flag combinations.Why a PR rather than a push to main
work/reference/git-boundaries.mdallows a direct push tomainonly for low-risk documentation commits. This is a code revert, so it goes through review like any other code change.🤖 Generated with Claude Code