Skip to content

fix(ci): remove orphaned conflict marker in AUDIT.md that fails the guards job on main - #795

Merged
groupthinking merged 1 commit into
mainfrom
claude/determined-maxwell-5tlj42
Jul 15, 2026
Merged

fix(ci): remove orphaned conflict marker in AUDIT.md that fails the guards job on main#795
groupthinking merged 1 commit into
mainfrom
claude/determined-maxwell-5tlj42

Conversation

@groupthinking

Copy link
Copy Markdown
Owner

Summary

Root-cause fix for why the merge queue is jammed. main's ci.yml guards job greps the whole tree for committed <<<<<<< / >>>>>>> merge-conflict markers (excluding only ci.yml itself). .github/workflows/AUDIT.md:24 carried a single orphaned <<<<<<< HEAD line — no matching =======/>>>>>>>, just leftover text inside a documentation table.

That one line makes the guards job fail on main itself, 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:

$ git grep -nE '^(<<<<<<<|>>>>>>>) ' -- . ':(exclude).github/workflows/ci.yml'
.github/workflows/AUDIT.md:24:<<<<<<< HEAD   # ← the only match on main

Change

  • Delete the orphaned <<<<<<< HEAD line (1 line, 1 file). The table rows above and below are already continuous, so removal restores a clean, valid table.

Verification

  • Reproduced the exact guards-job command on this branch — returns clean (no markers), so the job goes green:
    git grep -nE '^(<<<<<<<|>>>>>>>) ' -- . ':(exclude).github/workflows/ci.yml'  →  (no output)
    
  • Diff is 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's guards job 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

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
@vercel

vercel Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
v0-uvai Ready Ready Preview, Comment, Open in v0 Jul 15, 2026 3:36am

@github-actions github-actions Bot added ci/cd documentation Improvements or additions to documentation labels Jul 15, 2026
@coderabbitai

coderabbitai Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are limited based on label configuration.

🏷️ Required labels (at least one) (1)
  • [‘architecture-gap’, ‘bug’, ‘ci-cd’, ‘ci/cd’, ‘copilot-rabbit’, ‘documentation’, ‘duplicate’, ‘enhancement’, ‘frontend’, ‘github_actions’, ‘good first issue’, ‘help wanted’, ‘high-priority’, ‘invalid’, ‘javascript’, ‘ml-model’, ‘needs-triage’, ‘pipeline-critical’, ‘placeholder-code’, ‘priority:high’, ‘python’, ‘python:uv’, ‘question’, ‘styling’, ‘tests’, ‘v0’]

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 1418bcb1-775f-446d-8816-6069b09a32df

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/determined-maxwell-5tlj42
✨ Simplify code
  • Create PR with simplified code
  • Commit simplified code in branch claude/determined-maxwell-5tlj42

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Snapshot Warnings

⚠️: No snapshots were found for the head SHA 41980db.
Ensure 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 Files

None

Copy link
Copy Markdown
Owner Author

CI status — safe to merge. The one check that matters for this PR is green:

  • guardspassing. This PR's entire purpose (removing the orphaned <<<<<<< HEAD from AUDIT.md:24) is confirmed: the repo-wide conflict-marker scan is now clean.
  • test — failing on 2 pre-existing, unrelated tests, not caused by this PR:
    • tests/unit/test_looker_security.py::test_looker_embedded_service_no_secretDID NOT RAISE RuntimeError
    • tests/unit/test_looker_security.py::test_looker_embedded_service_with_secretLookerEmbeddedService() resolves to a MagicMock (mock/test-pollution issue)
    • 7162 passed, 2 failed. This diff is a single-line Markdown deletion — it cannot affect Python test mocking, so this red is inherited from main, not introduced here.

The Looker test failure is a separate, out-of-scope issue (mock leakage in test_looker_security.py) and should be fixed in its own PR rather than bundled into this minimal root-cause fix. If test is a required status check, this PR needs an admin merge; the guards fix itself is complete and verified.


Generated by Claude Code

@groupthinking
groupthinking marked this pull request as ready for review July 15, 2026 03:42
Copilot AI review requested due to automatic review settings July 15, 2026 03:42
@groupthinking
groupthinking merged commit 4eb99bd into main Jul 15, 2026
26 of 27 checks passed
@groupthinking
groupthinking deleted the claude/determined-maxwell-5tlj42 branch July 15, 2026 03:42

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Open in Devin Review

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Removes the orphaned conflict marker that caused the CI guards job to fail.

Changes:

  • Deletes the stray <<<<<<< HEAD line without altering documentation content.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci/cd documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants