القائمة
Rebase the current branch onto a target base branch and resolve conflicts safely while preserving intended behavior.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Rebase current branch on top of latest origin/main (and latest remote branch tip) while resolving conflicts cleanly.
Write and refine implementation tickets into loop-friendly, verifier-first units for any software project. Use when asked to decompose large initiatives, rewrite ticket plans, or review ticket quality for clarity, testability, and minimal coupling.
Engineering principles for durable fixes: eliminate root causes, prefer simplification, and apply abstractions only when they reduce complexity.
Use the `ag` CLI to inspect and mutate workspace/ticket state from terminal.
Fetch and summarize active pull request review feedback with `gh` (inline review comments, review decisions, and PR discussion comments) for the current branch.
Push current branch to origin and create/update the pull request with accurate title/body and validation notes.
| name | rebase |
| description | Rebase the current branch onto a target base branch and resolve conflicts safely while preserving intended behavior. |
git fetch origin).origin/main):
git rebase origin/maingit add <files>git rebase --continuegit rebase --abortgit push --force-with-lease--force.