Rebase Commit Push PR
Developmentrebase-commit-push-prRebase Commit Push PR is an Agent Skill for development published in the farm-fe/farm repository on GitHub: a SKILL.md instruction file an AI agent can load to do this task.
Fetch origin/main, rebase current branch, resolve conflicts safely, then commit and push changes; create a PR if none exists for the branch.
How to use this skill
Bring this guide into your coding agent with a prompt tailored to the tool you use.
- Open your project in Codex.
- Copy and paste the prompt below.
- Review files and risks before approving any action.
Inspect the Agent Skill at https://github.com/farm-fe/farm/blob/HEAD/.claude/skills/rebase-commit-push-pr/SKILL.md and all supporting files. Report provenance, permissions, scripts, dependencies, and security risks. Propose an exact installation into .agents/skills/rebase-commit-push-pr, but wait for my approval before writing files or running scripts.
Copying this prompt does not install or run the skill. Review third-party files before use.
Safely sync a working branch with origin/main, handle rebase conflicts, then publish and open a PR if needed.
Steps
-
Inspect branch and working tree
git branch --show-currentgit status --short- If there are unresolved conflicts already, stop and ask for user direction.
-
Fetch and rebase onto main
git fetch origin maingit rebase origin/main
-
Resolve rebase conflicts (if any)
- Check conflicted files:
git status --short - Resolve each conflict intentionally (do not run destructive resets).
- Stage resolved files:
git add <paths>orgit rm <paths>. - Continue:
git rebase --continue. - Repeat until rebase finishes or explicit user input is required.
- Check conflicted files:
-
Commit user-requested local changes (only if needed)
- If
git status --shortis empty, skip commit. - Else stage desired files (
git add -Aby default), then commit with a conventional message.
- If
-
Push branch
git push- If push is rejected after rebase, use
git push --force-with-leaseonly when user explicitly asked for rewritten-history push.
-
Ensure a PR exists
- Detect current branch PR:
gh pr list --head "$(git branch --show-current)" --json number,title,state,url
- If no PR exists, create one:
gh pr create --fill- If
--fillfails due to missing metadata, provide explicit--titleand--body.
- Detect current branch PR:
-
Report result
- Branch name
- Rebase outcome (and conflict files resolved)
- Commit hash/title created in this run (or note "no new commit")
- Push destination
- PR URL (existing or newly created)
Guardrails
- Never use
git reset --hard,git checkout --, or force push without explicit user approval. - Do not amend commits unless explicitly requested.
- If hooks/tests fail during commit or push, surface the first failure and stop.