fix(ci): remove orphaned conflict marker in AUDIT.md that fails the guards job on main - #795
Conversation
main's ci.yml `guards` job greps the whole tree for committed `<<<<<<< ` / `>>>>>>> ` merge-conflict markers (excluding only ci.yml). `.github/workflows/AUDIT.md:24` carried a stray orphaned `<<<<<<< HEAD` line — no matching separator — inside a documentation table. That single line makes the guards job fail on main itself, and every PR inherits the red check, which (with branch protection) blocks the entire merge queue. Prior conflict-marker fixes scanned code files and missed this workflow doc. Removing the one line restores a clean, continuous table and turns the guards job green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WdTF5JRWGfV3T5fxqoekWm
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Important Review skippedAuto reviews are limited based on label configuration. 🏷️ Required labels (at least one) (1)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository YAML (base), Repository UI (inherited), Organization UI (inherited) Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
✨ Simplify code
Comment |
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Snapshot WarningsEnsure that dependencies are being submitted on PR branches and consider enabling retry-on-snapshot-warnings. See the documentation for more information and troubleshooting advice. Scanned FilesNone |
|
CI status — safe to merge. The one check that matters for this PR is green:
The Looker test failure is a separate, out-of-scope issue (mock leakage in Generated by Claude Code |
Summary
Root-cause fix for why the merge queue is jammed.
main'sci.ymlguardsjob greps the whole tree for committed<<<<<<</>>>>>>>merge-conflict markers (excluding onlyci.ymlitself)..github/workflows/AUDIT.md:24carried a single orphaned<<<<<<< HEADline — no matching=======/>>>>>>>, just leftover text inside a documentation table.That one line makes the
guardsjob fail onmainitself, and every open PR inherits the red check. With branch protection requiring green checks, this blocks the entire backlog of open PRs from merging.Why prior fixes missed it
The several "resolve committed conflict markers" PRs (#734/#737/#787/#788/#789/#790) scanned code files. This marker lives in a workflow documentation file (
.github/workflows/AUDIT.md), so it survived every prior pass. It is the sole remaining offender:Change
<<<<<<< HEADline (1 line, 1 file). The table rows above and below are already continuous, so removal restores a clean, valid table.Verification
guards-job command on this branch — returns clean (no markers), so the job goes green:1 file changed, 1 deletion(-)— documentation only, no code or workflow-logic change.Not auto-merged
Draft, targeting protected
main. Merging needs human sign-off. Once merged,main'sguardsjob turns green and the inherited red check clears from the rest of the open PRs.🤖 Generated with Claude Code
https://claude.ai/code/session_01WdTF5JRWGfV3T5fxqoekWm
Generated by Claude Code