Conversation
Two durable learnings: 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 (#367) Closes the last substantive verbatim-carry gap found while auditing this repo against ptr727/ProjectTemplate for the convergence issues #329 and #339. ## What changed - `.github/copilot-instructions.md`: append the template's **"In a derived repo:"** paragraph (verbatim) to the "When in Doubt" section, 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) A full audit of #329 and #339 against the current template found nearly everything already converged (this repo is intentionally NuGet-only, no codegen, no Docker): - **#329**: the Copilot review runbook in `.github/copilot-instructions.md`, the AGENTS.md "PR Review Etiquette" contract, and `.markdownlint-cli2.jsonc` (byte-identical) are all already present. - **#339**: `.editorconfig` `[*.cs]` marked .NET-only with matching EOL rules; the AGENTS.md rule updates (comments house-rule, markdown trailing-backslash, versioning without "develop-ahead"); `CODESTYLE.md` (General + .NET, Python dropped); `retention-days: 1` on the one artifact upload. CI-storage/Docker-cache items are N/A (no Docker workflow). The only outstanding item was this one paragraph. Issue-closing keywords are intentionally omitted here (this PR targets `develop`); `Closes #329`/`Closes #339` will go on the `develop -> main` promotion PR so GitHub fires them on merge to the default branch. Note: issue #348 (branch-ruleset drift) is maintainer-gated live-config and is intentionally not addressed here. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR promotes the latest develop-ahead documentation convergence work to main, capturing process guidance for branch hygiene and issue-closing behavior, and aligning the Copilot runbook with the template’s upstream-drift reporting guidance.
Changes:
- Document how to mirror
main-only fixes back ontodevelopwithout violating the forward-only rule, including a recommendedgit diff origin/main origin/developstaleness check. - Clarify where to place
Closes #Nso GitHub actually closes issues on merge to the default branch (main). - Add the template-aligned “In a derived repo” paragraph to
.github/copilot-instructions.mddirecting contributors to report template-worthy drift upstream.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| AGENTS.md | Adds durable workflow/process guidance for keeping develop current with main-only fixes and for issue-closing keywords placement. |
| .github/copilot-instructions.md | Adds the template’s upstream-drift reporting guidance to the “When in Doubt” section. |
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 #329
Closes #339
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 todevelopwith a content-diff staleness check; putCloses #Non the promotion PR), converged through the Copilot review loop.Convergence audit (why #329 and #339 are done)
Audited every item in both issues against the current template. This repo is intentionally NuGet-only, no codegen, no Docker, so most items were already converged by prior work:
.github/copilot-instructions.md), the AGENTS.md "PR Review Etiquette" contract, and.markdownlint-cli2.jsonc(byte-identical to the template) are all present. Only the "In a derived repo:" paragraph was missing (Carry template upstream-drift reporting paragraph into copilot-instructions #367)..editorconfig[*.cs]marked .NET-only with matching per-extension EOL rules; AGENTS.md comments house-rule, markdown trailing-backslash, and versioning-without-"develop-ahead";CODESTYLE.md(General + .NET, Python dropped);retention-days: 1on the one artifact upload. Docker registry-cache guidance is N/A (no Docker workflow).Remaining differences are intentional, repo-accurate divergence (NuGet-only project names,
CODESTYLE.mdbuild-requirements text matching this repo's actualDirectory.Build.props).Not included
Issue #348 (branch-ruleset drift: extra
creationrule +do_not_enforce_on_create) is maintainer-gated live GitHub config and is intentionally left for a maintainer decision (whether the extracreationrule is intended). Surfaced separately, not closed here.Diff
developis a clean superset ofmain(4 insertions across two doc files, no deletions - nomain-only stragglers).