Conversation
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. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ctions (#234) Closes the last substantive verbatim-carry gap found while auditing this repo against ptr727/ProjectTemplate for the convergence issues #160 and #176. ## What changed - `.github/copilot-instructions.md`: add the **"In a derived repo:"** paragraph from the template's "When in Doubt" section (verbatim), directing contributors to open an upstream issue in `ptr727/ProjectTemplate` when a discrepancy belongs in the template rather than only fixing it locally. ## Audit result (context) An audit of every item in #160 and #176 against the current template found nearly everything already converged: - **#160**: `.markdownlint-cli2.jsonc` byte-identical; `.editorconfig` line-ending rules fully converged; rulesets already lowercase `develop`/`main`. Done. - **#176**: consolidated `CODESTYLE.md` (General + .NET), `.NET`-cased tasks with `dependsOrder: sequence`, `retention-days: 1` on the release-asset upload, and `smoke`-gated build/upload are all present. The AGENTS.md rule updates (comments house-rule, markdown trailing backslash, versioning, CI storage) are present. Docker registry-cache guidance is N/A (no Docker workflow here). The only outstanding item was this one paragraph. Issue-closing keywords are intentionally omitted here (this PR targets `develop`); `Closes #160`/`Closes #176` will go on the `develop -> main` promotion PR so GitHub fires them on merge to the default branch. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Promotes documentation-only process guidance from develop to main, closing #160 and #176 by carrying the last missing template-aligned paragraph and recording CI/CD workflow learnings for future contributors.
Changes:
- Add guidance in
AGENTS.mdto mirror any main-only fixes back todevelop, with a concrete staleness check (git log origin/develop..origin/main). - Add guidance in
AGENTS.mdto placeCloses #Nkeywords on thedevelop -> mainpromotion PR so GitHub auto-closes issues on merge to the default branch. - Add the template’s “In a derived repo:” upstream-drift reporting paragraph to
.github/copilot-instructions.md.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| AGENTS.md | Adds contributor guidance for branch staleness detection and correct placement of issue-closing keywords. |
| .github/copilot-instructions.md | Adds upstream template drift-reporting guidance for derived repos. |
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>
This was referenced Jul 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Promotes the two commits currently ahead on
developtomain.Closes #160
Closes #176
What's promoted
.github/copilot-instructions.md. This was the last substantive verbatim-carry gap from a full audit of both convergence issues againstptr727/ProjectTemplate.AGENTS.md(mirror main-only fixes back todevelop; putCloses #Non the promotion PR).Convergence audit (why #160 and #176 are done)
Every item in both issues was checked against the current template; nearly all were already converged by prior work, so only #234's one paragraph remained:
.markdownlint-cli2.jsoncbyte-identical to the template;.editorconfigper-extension line-ending rules fully converged (the[*.cs]/ReSharper .NET block is intentionally kept); rulesets already lowercasedevelop/main.CODESTYLE.md(General + .NET, Python dropped);.NET-casedtasks.jsonwithdependsOrder: sequenceon.NET Format;retention-days: 1on the release-asset upload;smoke-gated build/pack/upload inbuild-release-task.yml. The AGENTS.md rule updates (comments house-rule, markdown trailing-backslash, versioning without "develop-ahead", CI storage) are all present. Docker registry-cache guidance is N/A (no Docker workflow in this repo).Remaining differences are intentional, repo-accurate divergence (repo-specific project/task names, and
CODESTYLE.mdbuild-requirements text that matches this repo's actualDirectory.Build.props).Diff
Two-dot and three-dot content diffs are identical: 4 insertions across
AGENTS.mdand.github/copilot-instructions.md.developis a clean superset ofmain(no main-only stragglers).