Skip to content

docs: unpin the branch-pinned CONTRIBUTORS.md links in the PR template - #1879

Merged
cliffhall merged 2 commits into
v2/mainfrom
v2/docs/1813-v1-policy-wording
Aug 1, 2026
Merged

docs: unpin the branch-pinned CONTRIBUTORS.md links in the PR template#1879
cliffhall merged 2 commits into
v2/mainfrom
v2/docs/1813-v1-policy-wording

Conversation

@cliffhall

@cliffhall cliffhall commented Aug 1, 2026

Copy link
Copy Markdown
Member

Closes #1813

Scope note. #1813 has two halves. This PR is the PR-template-link half only. The v1-policy wording reconciliation is being handled on #1866's branch (v2/docs/post-swap-branch-model-and-pr-policy), which rewrites that prose wholesale and merges first — doing it in both places would produce contradictory text plus a merge conflict.

One wording line was changed here before that split was agreed and is left in place rather than reverted piecemeal: README.md's "Repo status" callout, (bug fixes only)(security fixes only). If #1866 ends up covering it, drop it from this PR at merge time.

Branch-pinned PR-template links

.github/pull_request_template.md linked to CONTRIBUTORS.md twice, both pinned to blob/main/:

  • the HTML-comment "Full policy:" line
  • the rendered "Heads up" blockquote — [CONTRIBUTORS.md](../blob/main/CONTRIBUTORS.md)

main is release-only, so those resolved against the last released tree rather than the branch the reader is on — and they'd break outright when CONTRIBUTORS.md is renamed (#1821) until a milestone merge carries the new name to main.

Both are now relative (../CONTRIBUTORS.md, relative to .github/), so they follow whatever branch is being read rather than being repointed at another fixed branch.

Conflict avoidance

Everything touched here is outside #1866's diff — that PR changes AGENTS.md and .github/copilot-instructions.md only. The four AGENTS.md locations listed in #1813's table are all inside #1866's rewrite (three of them don't exist on v2/main yet), and CONTRIBUTORS.md:54 already read "security fixes only", so neither file is touched here.

Testing

Docs-only. No format/lint/typecheck/coverage gate covers .md (the format:check globs are source-extension only), and no code paths are touched.

The v1 maintenance policy was stated two different ways across the docs —
"security fixes only" in CONTRIBUTORS.md, "bug fixes" in README.md. The
#1819 PR triage told 120 contributors that v1 is security-fixes-only, so
that is the wording we keep.

Also make the PR template's two CONTRIBUTORS.md links relative instead of
pinned to blob/main/. `main` is release-only, so those resolved against
the last released tree rather than the branch the reader is on.

The remaining AGENTS.md occurrences are left alone deliberately: PR #1866
rewrites those exact lines and lands first.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YAt8rqxysNbhYWLhoRm3fU
@cliffhall cliffhall added the v2 Issues and PRs for v2 label Aug 1, 2026
@cliffhall
cliffhall requested a review from Copilot August 1, 2026 00:30

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR makes small, targeted documentation adjustments to (1) standardize the v1 maintenance-policy wording and (2) fix PR-template links so they don’t point at a branch-pinned blob/main/... path.

Changes:

  • Updates the README “Repo status” callout to use “security fixes only” wording for the v1 line.
  • Converts PR template links to CONTRIBUTORS.md from blob/main/... to relative paths so they follow the branch being viewed.

Reviewed changes

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

File Description
README.md Updates the v1 policy wording in the repo-status callout.
.github/pull_request_template.md Replaces blob/main-pinned links with relative paths to CONTRIBUTORS.md.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread README.md Outdated
```

> **Repo status.** This is the **v2** line of the Inspector (branch `v2/main`). The `main` branch is the legacy v1 implementation (bug fixes only). v2 will eventually replace `main`. See [`AGENTS.md`](./AGENTS.md) for branch/board conventions.
> **Repo status.** This is the **v2** line of the Inspector (branch `v2/main`). The `main` branch is the legacy v1 implementation (security fixes only). v2 will eventually replace `main`. See [`AGENTS.md`](./AGENTS.md) for branch/board conventions.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Good catch, and you're right that the callout is factually stale — but I'm deliberately not fixing it here. The "Repo status" prose (which branch is which, and the v1 maintenance policy sentence) is owned by open PR #1866, which rewrites exactly that material and merges before this one. Rewording it in two places at once would produce contradictory text plus a merge conflict for zero benefit.

This PR's remaining scope is the .github/pull_request_template.md half: unpinning the two blob/main/CONTRIBUTORS.md links so they're relative and follow whatever branch the reader is on. The README/AGENTS.md wording reconciliation, including the main vs. v1/main correction you're pointing at, is being handled on #1866's branch.

@cliffhall cliffhall changed the title docs: reconcile the v1 policy wording and fix branch-pinned PR-template links docs: unpin the branch-pinned CONTRIBUTORS.md links in the PR template Aug 1, 2026
The "Repo status" callout edit here patched `(bug fixes only)` →
`(security fixes only)` on the callout as it exists on v2/main. But #1866
replaces that entire callout, because the surrounding sentence is false today:
it still says "The `main` branch is the legacy v1 implementation", when `main`
now holds the latest released v2.

So this edit both collides with #1866 on the same line and, taken on its own,
would preserve the false statement while correcting only the parenthetical.
#1866 already sets the v1 policy wording to "security fixes only" across
AGENTS.md and README (ee020ff), so nothing is lost by dropping it here.

This PR is now exactly its intended half: the two branch-pinned
`blob/main/CONTRIBUTORS.md` links in .github/pull_request_template.md, made
relative. That file is untouched by #1866, so the two PRs no longer overlap on
any line.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YAt8rqxysNbhYWLhoRm3fU
@cliffhall

Copy link
Copy Markdown
Member Author

Dropped the README.md change in the latest commit; this PR is now exactly the PR-template-link half.

The overlap check that concluded "#1866 changes only AGENTS.md and .github/copilot-instructions.md" was incorrect — #1866 touches four files including README.md, and specifically replaces the whole "Repo status" callout this PR was patching. Two problems with the edit as it stood:

  1. Same-line collision with docs: post-swap branch model, PR policy, milestone rule, and Copilot review instructions #1866, which merges first.
  2. On its own it corrected the parenthetical to (security fixes only) while preserving the sentence around it — "The main branch is the legacy v1 implementation" — which is false now that main holds the latest released v2.

Nothing is lost: #1866's ee020ff2 already settles the v1 policy wording as "security fixes only" across AGENTS.md and README. The two PRs now share no file.

cliffhall added a commit that referenced this pull request Aug 1, 2026
…e policy (#1884)

* docs: rename CONTRIBUTORS.md to CONTRIBUTING.md (#1883)

GitHub's contributing-guidelines banner — shown when someone clicks
"New issue" or opens a pull request — keys on the exact filename
CONTRIBUTING.md. Naming the file CONTRIBUTORS.md left that prompt dark
precisely where the "open an issue, not a PR" policy needs to land.

Renamed with `git mv` so history follows the file; contents are
unchanged (its heading already reads "Contributing to MCP Inspector").
Updated the one in-repo reference, in AGENTS.md. The two links in
.github/pull_request_template.md are deliberately untouched — PR #1879
makes them relative so they follow the rename.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YAt8rqxysNbhYWLhoRm3fU

* docs: drop the AGENTS.md link edit; #1866 owns that line

This PR edited the `See [CONTRIBUTORS.md](./CONTRIBUTORS.md)` link in
AGENTS.md, which is the exact line #1866 rewrites — guaranteeing a one-line
conflict when this merges after it.

Handing that line to its owner instead: #1866 now writes the link as
`CONTRIBUTING.md` directly, so this PR is a pure `git mv` and the two touch no
common line. No conflict to resolve at merge time.

The tradeoff is a short window between the two merges where AGENTS.md links to
a filename that doesn't exist yet. That's deliberate and bounded: #1866 is
first in the merge order and this is third.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YAt8rqxysNbhYWLhoRm3fU

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
@cliffhall
cliffhall merged commit 7cc3c12 into v2/main Aug 1, 2026
3 checks passed
@cliffhall
cliffhall deleted the v2/docs/1813-v1-policy-wording branch August 1, 2026 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v2 Issues and PRs for v2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docs: reconcile the v1 policy wording and fix branch-pinned PR-template links

2 participants