b60638f0a3
Community Skills (32): - jat: jat-start, jat-verify, jat-complete - pi-mono: codex-cli, codex-5.3-prompting, interactive-shell - picoclaw: github, weather, tmux, summarize, skill-creator - dyad: 18 skills (swarm-to-plan, multi-pr-review, fix-issue, lint, etc.) - dexter: dcf valuation skill Agents (23): - pi-mono subagents: scout, planner, reviewer, worker - toad: 19 agent configs (Claude, Codex, Gemini, Copilot, OpenCode, etc.) System Prompts (91): - Anthropic: 15 Claude prompts (opus-4.6, code, cowork, etc.) - OpenAI: 49 GPT prompts (gpt-5 series, o3, o4-mini, tools) - Google: 13 Gemini prompts (2.5-pro, 3-pro, workspace, cli) - xAI: 5 Grok prompts - Other: 9 misc prompts (Notion, Raycast, Warp, Kagi, etc.) Hooks (9): - JAT hooks for session management, signal tracking, activity logging Prompts (6): - pi-mono templates for PR review, issue analysis, changelog audit Sources analyzed: jat, ralph-desktop, toad, pi-mono, cmux, pi-interactive-shell, craft-agents-oss, dexter, picoclaw, dyad, system_prompts_leaks, Prometheus, zed, clawdbot, OS-Copilot, and more
67 lines
1.7 KiB
Markdown
67 lines
1.7 KiB
Markdown
---
|
|
name: dyad:pr-rebase
|
|
description: Rebase the current branch on the latest upstream changes, resolve conflicts, and push.
|
|
---
|
|
|
|
# PR Rebase
|
|
|
|
Rebase the current branch on the latest upstream changes, resolve conflicts, and push.
|
|
|
|
## Instructions
|
|
|
|
1. **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 push
|
|
- `upstream` points to the **base repo** - this is what you rebase onto
|
|
|
|
For same-repo PRs, `origin` points to the main repo and there may be no `upstream`.
|
|
|
|
2. **Fetch the latest changes:**
|
|
|
|
```
|
|
git fetch --all
|
|
```
|
|
|
|
3. **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
|
|
```
|
|
|
|
4. **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
|
|
|
|
5. **Run lint and push:**
|
|
|
|
Run the `/dyad:pr-push` skill to run lint checks, fix any issues, and push the rebased branch.
|
|
|
|
6. **Summarize the results:**
|
|
- Report that the rebase was successful
|
|
- List any conflicts that were resolved
|
|
- Note any lint fixes that were applied
|
|
- Confirm the branch has been pushed
|