القائمة
Use this skill when the user wants to synchronize their current branch with another branch. Prioritizes linear history using fast-forward merges and rebasing.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Use this skill when the user wants to commit code changes. Follows the Conventional Commits specification.
Use this skill when creating or editing pull requests. Generates well-structured PR descriptions following GitHub best practices for reviewability.
Structural code search and rewrite using AST patterns via ast-grep. Use when text search is too brittle, you need syntax-aware queries, or want to find/transform code by structure rather than string content.
Test-driven development with red-green-refactor loop. Use when user wants to build features or fix bugs using TDD, mentions "red-green-refactor", wants integration tests, or asks for test-first development.
| name | sync-branch |
| description | Use this skill when the user wants to synchronize their current branch with another branch. Prioritizes linear history using fast-forward merges and rebasing. |
git rebase over git merge for incorporating changesgit status
git branch -vv
git log --oneline -5
If current branch has NO unpushed commits:
git fetch origin
git rebase origin/<target-branch>
If current branch HAS unpushed commits:
git stash), rebase, then git stash popgit branch backup), rebase, then cherry-pick or rebase the backup onto the new base--keep-empty flaggit status # identify conflicted files
# Edit conflicted files to resolve
git add <resolved-files>
git rebase --continue
git log --oneline --graph -10
git status
If something goes wrong:
git rebase --abort
If rebasing was done on a private feature branch:
git push --force-with-lease
Do NOT use --force as it is unsafe.
Never force push to:
Always confirm with the user before any destructive operation.