Menú
Rebase the current branch on the latest upstream changes, resolve conflicts, and push.
Instalar con Codex o Claude Copia este prompt, pégalo en Codex, Claude u otro asistente, y deja que revise la página de la skill y la instale por ti.
Basado en la clasificación ocupacional SOC
Commit any uncommitted changes, run lint checks, fix any issues, and push the current branch.
Root-cause flaky or failing E2E tests from a specific CI run by downloading and analyzing the Playwright HTML report (traces, screenshots, errors). Use this when given a GitHub Actions run URL and asked to investigate failures. Diagnose from report artifacts first, then rebuild and rerun the affected E2E tests locally after making fixes.
Fix failing CI checks and GitHub Actions on a Pull Request.
Read all unresolved GitHub PR comments from trusted authors and address or resolve them appropriately.
Automatically gather flaky E2E tests from recent CI runs on the main branch and from recent PRs by wwwillchen/keppo-bot/dyad-assistant, then deflake them.
Promote the latest pre-release to a stable release by creating a release branch, bumping the version, and pushing.
| name | dyad:pr-rebase |
| description | Rebase the current branch on the latest upstream changes, resolve conflicts, and push. |
Rebase the current branch on the latest upstream changes, resolve conflicts, and push.
Determine the git remote setup:
git remote -v
git branch -vv
In GitHub Actions for cross-repo PRs:
origin points to the head repo (fork) - this is where you pushupstream points to the base repo - this is what you rebase ontoFor same-repo PRs, origin points to the main repo and there may be no upstream.
Fetch the latest changes:
git fetch --all
Rebase onto the base branch:
Use upstream/main if the upstream remote exists (cross-repo PR), otherwise use origin/main:
# Check if upstream remote exists
git remote get-url upstream 2>/dev/null && git rebase upstream/main || git rebase origin/main
If there are merge conflicts:
Identify the conflicting files from the rebase output
Read each conflicting file and understand both versions of the changes
Resolve the conflicts by editing the files to combine changes appropriately
Stage the resolved files:
git add <resolved-file>
Continue the rebase:
git rebase --continue
Repeat until all conflicts are resolved and the rebase completes
Run lint and push:
Run the /dyad:pr-push skill to run lint checks, fix any issues, and push the rebased branch.
Summarize the results: