Skip to content

Record develop-staleness and issue-closing learnings in AGENTS.md#233

Merged
ptr727 merged 1 commit into
developfrom
docs/agents-learnings
Jul 3, 2026
Merged

Record develop-staleness and issue-closing learnings in AGENTS.md#233
ptr727 merged 1 commit into
developfrom
docs/agents-learnings

Conversation

@ptr727

@ptr727 ptr727 commented Jun 30, 2026

Copy link
Copy Markdown
Owner

Two durable learnings from the CI/CD work: mirror main-only fixes to develop (and check git diff origin/develop origin/main before relying on develop), and put Closes #N in the promotion PR. No code changes.

Copilot AI review requested due to automatic review settings June 30, 2026 04:13

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

Updates contributor/agent guidance in AGENTS.md to capture two process learnings from recent CI/CD work - keeping develop aligned when fixes land directly on main, and ensuring issue auto-close keywords are applied where GitHub will actually act on them.

Changes:

  • Add guidance to mirror main-only fixes back to develop and to check git diff origin/develop origin/main before relying on develop.
  • Add guidance about placing Closes #N on the develop -> main promotion PR to ensure GitHub closes the issue on merge to the default branch.

Comment thread AGENTS.md Outdated
Comment thread AGENTS.md Outdated

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

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Comment thread AGENTS.md Outdated
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

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

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

@ptr727 ptr727 merged commit 8976f6d into develop Jul 3, 2026
11 checks passed
@ptr727 ptr727 deleted the docs/agents-learnings branch July 3, 2026 16:57
ptr727 added a commit that referenced this pull request Jul 3, 2026
…#236)

Refines the develop-staleness guidance added in #233. Driving that
promotion (#235) exposed that the `git log origin/develop..origin/main`
form is noisy in this repo's bots-target-both model.

## Why
Running `git log origin/develop..origin/main` on a clean, current
`develop` returned ~50 commits - all routine promotion merges and
`main`-direct dependabot/codegen commits whose content `develop` already
carries via its own parallel bot PRs (even `--no-merges --cherry-pick
--right-only` still lists them, since parallel bumps have different
patch-ids). It cannot cheaply distinguish "develop is missing a
main-only fix" from that expected topology noise.

## What changed
Use a **content** diff that reflects final tree state, read
directionally:
- `git diff origin/main origin/develop` - hunks it would *remove* are
content on `main` that `develop` lacks (real staleness); hunks it *adds*
are `develop`'s normal unpromoted work.

This also resolves the original Copilot objection to a plain `git diff`
(that non-empty != stale): the fix is to read the diff's *direction*,
not its emptiness.

Verified on #235: for a clean `develop`, this diff was exactly the doc
files `develop` adds - no `main`-only content - which is the correct
"not stale" reading.

Issue-closing keywords omitted (targets `develop`); no issue to close.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants