From 5887d051c4a9f440bd1f229136ad017995eba797 Mon Sep 17 00:00:00 2001
From: Rudy Celekli <rudy@gradiahq.com>
Date: Sun, 25 Oct 2026 11:59:10 -0400
Subject: [PATCH] fix(cursor-team-kit): diff review-and-ship against the real
 base branch

---
 cursor-team-kit/skills/review-and-ship/SKILL.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cursor-team-kit/skills/review-and-ship/SKILL.md b/cursor-team-kit/skills/review-and-ship/SKILL.md
index 000e75379..2574f0fa6 100644
--- a/cursor-team-kit/skills/review-and-ship/SKILL.md
+++ b/cursor-team-kit/skills/review-and-ship/SKILL.md
@@ -21,8 +21,10 @@ Reviewing changes before shipping. Close key issues, verify behavior, and open o
 ## Suggested Checks
 
 ```bash
-git fetch origin main
-git diff origin/main...HEAD
+# The PR's base when one exists, otherwise the repo's default branch (not always main)
+BASE=$(gh pr view --json baseRefName -q .baseRefName 2>/dev/null || gh repo view --json defaultBranchRef -q .defaultBranchRef.name)
+git fetch origin "$BASE"
+git diff "origin/$BASE...HEAD"
 git status
 gh pr checks --json name,bucket,state,workflow,link
 ```