Upstream Patches

This handles the workflow for managing patch files on top of a Terraform provider submodule using a shell script wrapper. You'd reach for it when upgrading a provider breaks existing patches, when you need to amend a patch that's causing a regression, or when rebasing your patch stack onto a new upstream commit. The skill enforces a specific flow: find the owning commit first, use non-interactive rebase over interactive where possible, and always amend existing patches rather than creating new ones unless explicitly asked. It's built around the assumption that agents shouldn't hand-edit patch files or make direct commits to the submodule. The verification checklist and conflict resolution steps are detailed enough to be genuinely useful.

Install to Claude Code

npx -y skills add pulumi/agent-skills --skill upstream-patches --agent claude-code