mirror of
https://github.com/rcourtman/Pulse.git
synced 2026-10-24 12:42:49 +00:00
rcourtman
2a247e244e
The per-commit receipt change left frontend-modern/browser-verification.json in the tree, frozen, so that it would not conflict with the pull requests still rewriting it. Nothing reads the file at the tip: range mode reads a receipt from the commit that recorded it. Left in place it invites the old habit and keeps those pull requests conflicting with each other on it. The guard now refuses a staged tree or a range tip that carries the file, rather than only a commit that writes it. Without that, resolving the modify/delete conflict by keeping the file changes nothing against HEAD, passes the hook, and restores the file on main when the branch merges. A pull request that still rewrites the file is repaired by merging main and removing the file with git rm. Its commits remain valid evidence in range mode.