القائمة
Follow this before any commit, PR, or merge. Covers commit identity, branch hygiene, and merge mechanics so agents stop re-deriving the flow and wasting tokens.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Decision tree for a red CI run. Use BEFORE retrying — blind re-runs burn the shared GitHub rate limit and hide real bugs.
Use agent-tools GitHub wrappers for frequent GitHub operations before generating direct gh commands.
| name | dev-flow-commit-merge |
| description | Follow this before any commit, PR, or merge. Covers commit identity, branch hygiene, and merge mechanics so agents stop re-deriving the flow and wasting tokens. |
Use this skill whenever you are about to commit, open a PR, or merge.
Shared boxes often have no git identity → bare git commit fails with
Author identity unknown. Do not git config --global. Identity
comes from agent-tools.yaml (identity.*). Prefer the wrapped recipe;
if invoking git directly as a fallback:
git -c user.name="$IDENTITY_NAME" -c user.email="$IDENTITY_EMAIL" commit -F - <<'EOF'
<subject>
<body>
<pr_owner_line from config, if set>
<commit_trailer from config, if set>
EOF
-F -). Never -m "..." with backticks — the shell mangles it
into a truncated commit.identity.pr_owner_line when set.git branch --show-current
Real incident: a commit landed on local main because the agent
assumed it was on the feature branch. Recovery:
git branch -f <feature-branch> <commit-sha> # or: git cherry-pick <sha>
git checkout <feature-branch>
git branch -f main origin/main # un-pollute local main
Remote main is only polluted if you git push from main — never
push from main.
git merge-base --is-ancestor origin/<default> HEAD. If behind,
git merge origin/<default> first — a stale branch either blocks
merge or drags an out-of-date tree (and can mask CI matrix drift).github.merge config: squash + delete-branch +
verify the returned merge-commit oid. Honor require_green.