菜单
Manage sequential PR merges from git worktrees — covering rebase timing, dotnet restore on cold checkouts, gh pr merge exit code interpretation, and force-push configuration. WHEN: merging PRs from git worktrees, debugging NETSDK1004 on worktree test runs, interpreting non-zero exit from gh pr merge, or resolving worktree branch push failures.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
{what this skill teaches agents}
Add boolean configuration flags to the update-config CLI command using TryParseRequiredBoolean() for argument parsing and GetOrCreateObject() for JSON section navigation, following the three-step flow and nesting conventions established across PRs #85, #86, and #92. WHEN: adding a new --flag to update-config, nesting a config value under a JSON section, or writing unit tests for CLI config flag parsing.
Resolve configuration file paths in CLI commands using the same shared pipeline as the doctor/diagnostics so all commands target the same effective config file. WHEN: adding a new CLI command that reads or writes config, debugging a command that mutates a different config file than doctor reports, or implementing config-aware CLI behavior in a multi-location config environment.
Implement discovery-source attribution tracking for MCP tool enumeration by creating a dedicated tracker interface with first-writer-wins semantics, recording at discovery call sites (not in the doctor/reporter), and wiring both in-process and OOP paths to agree on provenance. WHEN: the doctor or a reporting surface infers tool source heuristically, adding source attribution to a new discovery path, or aligning in-process and OOP discovery provenance.
Implement OAuth 2.1 + Entra ID authentication for an MCP server using a lightweight AS metadata proxy — handling RFC 9728 protected resource metadata, RFC 8414 AS metadata, and a /register endpoint that eliminates client_id prompts for all MCP clients. WHEN: adding OAuth to an MCP server, MCP clients ask users to paste a client_id, authorization redirects go to the wrong endpoint, or debugging Entra DCR limitations.
Publish .NET NuGet packages to GitHub Packages using GitHub PAT authentication — covering gh auth token retrieval, write:packages scope verification, dotnet pack/push workflow, and owner resolution from git remote. WHEN: publishing a NuGet package to GitHub Packages, debugging 401 on dotnet nuget push, adding a GitHub Packages NuGet source, or resolving write:packages scope errors.
| name | worktree-pr-merge |
| description | Manage sequential PR merges from git worktrees — covering rebase timing, dotnet restore on cold checkouts, gh pr merge exit code interpretation, and force-push configuration. WHEN: merging PRs from git worktrees, debugging NETSDK1004 on worktree test runs, interpreting non-zero exit from gh pr merge, or resolving worktree branch push failures. |
| domain | git-workflow |
| confidence | medium |
| source | observed |
Git worktrees enable parallel PR development by creating isolated branch checkouts tied to the main worktree. When merging PRs sequentially to main, each worktree must coordinate its state with the previous merge. This skill covers the recurring patterns that prevent build failures, false exit code errors, and branch push failures.
dotnet restore before dotnet test --no-restore when a worktree has never been built. The --no-restore flag fails with error NETSDK1004 on cold checkouts. Run restore once; subsequent test runs can use --no-restore.gh pr merge --delete-branch returns non-zero exit even when the squash merge succeeds on GitHub. The actual merge is successful; the failure is from the local branch-delete step (fatal: 'main' is already used by worktree). Inspect GitHub to confirm the merge landed. Do not treat non-zero exit as a merge failure.git push --force-with-lease origin <branch>. Omitting the remote name causes "no upstream configured" errors.Program.cs), they must merge to main sequentially. Parallel merges cause file conflicts on subsequent worktree rebases. Enforce sequential ordering in CI/automation.Rebase after merge:
# After previous PR merges to main, rebase the current worktree branch
git rebase origin/main
Dotnet restore on first run:
dotnet restore
dotnet test --no-restore
Inspect GitHub despite non-zero exit:
gh pr merge <pr-number> --squash --delete-branch
# Returns exit 128 even if merge succeeded. Verify on GitHub before failing.
Force-push from worktree:
git push --force-with-lease origin feature-branch # Explicit remote required
Sequential PR merge strategy:
PR-A (touches Program.cs) → merge to main → rebase PR-B → merge to main
PR-B (touches Program.cs)
PR-C (different file) → can be parallel to A or B
dotnet test --no-restore on a cold worktree without prior dotnet restore → NETSDK1004 errorgh pr merge --delete-branch as a GitHub merge failuregit push --force-with-lease from a worktree without upstream tracking