Skip to content

[Klaud Cold] AGENTS: note sweep doesn't trigger while a PR has merge conflicts#1495

Merged
functionstackx merged 1 commit into
mainfrom
docs-rebase-required-for-sweep
May 18, 2026
Merged

[Klaud Cold] AGENTS: note sweep doesn't trigger while a PR has merge conflicts#1495
functionstackx merged 1 commit into
mainfrom
docs-rebase-required-for-sweep

Conversation

@functionstackx
Copy link
Copy Markdown
Collaborator

Summary

Single-paragraph doc edit in AGENTS.md under "Pull Request Sweep Labels": calls out that a PR sitting on a stale branch with a perf-changelog.yaml conflict will land in NO_SWEEP / NO_SUCCESS even when sweep-enabled / full-sweep-enabled is applied — the run-sweep.yml workflow needs the PR to be cleanly mergeable into main first.

Surfaced this repeatedly today (#1422, #1451) — the dashboard would show NO_SWEEP and it wasn't obvious that "no sweep" meant "rebase your branch" rather than "the label dropped" or "something is broken upstream". Points readers at the existing canonical resolution recipe in KLAUD_DEBUG.md §1.1.

Test plan

  • Doc-only diff.

🤖 Generated with Claude Code

A stale claude/* or update-* branch with a perf-changelog.yaml
conflict (most common case) sits in NO_SWEEP / NO_SUCCESS even when
sweep-enabled or full-sweep-enabled is applied — the run-sweep.yml
workflow needs the PR to cleanly merge into main first.

Adds a paragraph under "Pull Request Sweep Labels" pointing at the
existing canonical resolution recipe in KLAUD_DEBUG.md §1.1.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@functionstackx functionstackx requested a review from a team May 18, 2026 07:00
@functionstackx functionstackx merged commit 340b88f into main May 18, 2026
@functionstackx functionstackx deleted the docs-rebase-required-for-sweep branch May 18, 2026 07:00
Copy link
Copy Markdown
Contributor

@claude claude Bot left a comment

Choose a reason for hiding this comment

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

LGTM — single-paragraph doc note in AGENTS.md clarifying that the sweep won't run on PRs with merge conflicts.

Extended reasoning...

Overview

The PR adds a single paragraph to AGENTS.md under the "Pull Request Sweep Labels" section, explaining that run-sweep.yml won't trigger while a PR has merge conflicts even with sweep labels applied, and points to the canonical resolution recipe already documented in KLAUD_DEBUG.md §1.1.

Security risks

None. This is a documentation-only change with no executable code, no configuration, and no impact on auth/permissions/data handling.

Level of scrutiny

Minimal scrutiny is appropriate. This is a pure prose addition to an agent-facing markdown file. There is no code path, workflow, or schema affected. The content is consistent with the existing perf-changelog.yaml whitespace warnings already present in the same file.

Other factors

The note accurately reflects standard GitHub Actions behavior (PR-triggered workflows are gated on a clean mergeable state) and references an existing canonical recipe rather than duplicating it. No outstanding reviewer comments, no bugs flagged by the bug-hunting system.

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

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

1 participant