dev-git-workflow
Use for non-trivial Git state such as branch strategy, worktrees, merge/rebase decisions, conflicts, reviewer-facing PR preparation, tags, and release notes. Do not trigger for a routine commit, push, or PR that needs no strategy decision.
BlueSkyXN · Static checks on file
Installation
Read the source and dependencies before running a command. Copying does not install or execute anything.
npx skills add BlueSkyXN/Codex-is-all-you-need --skill dev-git-workflowAbout this skill
name: dev-git-workflow description: Use for non-trivial Git state such as branch strategy, worktrees, merge/rebase decisions, conflicts, reviewer-facing PR preparation, tags, and release notes. Do not trigger for a routine commit, push, or PR that needs no strategy decision. metadata: version: "0.5" updated: "2026-07-26"
Git workflow
Use this workflow when the task involves non-trivial Git state, branch management, reviewer-facing PR preparation, merge strategy, or release history.
Steps
-
Inspect state first.
git status --short- Current branch
- Remotes
- Worktree/linked worktree status
- Diff and untracked files
-
Preserve user work.
- Do not reset or checkout away changes that you did not make.
- Separate unrelated changes from the current task.
- Use isolated branches or worktrees for risky work when possible.
-
Choose the operation.
- Commit local changes
- Prepare PR diff
- Draft, create, or update PR title and body
- Rebase or merge
- Resolve conflict
- Tag release
- Audit branch usefulness
-
Validate history and diff.
- Check staged files.
- Check
git diff --check. - Read the final diff before commit.
- Resolve the intended base and head branches.
- Read the full base-to-head diff and commit range before describing a PR.
-
Prepare PR metadata when opening, updating, or rewriting a PR.
- Read
references/pr-metadata-contract.mdcompletely before drafting the title or body. - Derive the copy from the current full diff, user goal, repository guidance, validation evidence, and delivery state.
- Select the language using the contract, and apply it to both the title's descriptive text and the body. An English commit subject is not a repository language requirement.
- Use an explicit title and body. Treat auto-filled metadata as a draft that must still pass the contract.
- If the user only asks for a draft, return the draft without writing remote state.
- Read
-
Publish, gate, and read back remote state when requested.
- Use the available GitHub connector or CLI after the branch is pushed.
- Re-read the remote title, body, base/head branches, head SHA, draft/state, mergeability, and checks after creation or update.
- When review or merge is in scope, also read the review decision, requested changes, unresolved review conversations, and applicable repository gates, including required approvals/checks and the allowed merge method or queue.
- Treat absent checks or reviews as none reported, not as passed; confirm whether repository rules require them.
- Compare the remote copy with the current head and the metadata contract; repair stale or unclear copy before declaring the PR complete.
- Immediately before merge, confirm the remote head SHA still matches the validated head. After merge, read back the merged state and target branch.
-
Communicate exact boundaries.
- Local commit only
- Pushed branch
- PR opened or updated against a base branch
- Draft or ready for review
- Review and approval state
- Merged or not merged
- Checks passed/pending/failed
- Released or deployed
- Mergeability status
Output
Return:
- Git operation performed or recommended
- Branch and commit details
- Files included
- PR title/body or remote PR URL when in scope
- Validation
- Remaining remote, review, release, or runtime state
Do not
- Do not use destructive commands without explicit instruction.
- Do not mix unrelated diffs into a commit.
- Do not reuse a commit subject as final PR metadata without checking the full diff.
- Do not describe an open PR against
mainas already merged or submitted intomain. - Do not expose memory citations, agent process notes, private local paths, temporary files, or internal session links in PR-facing copy.
- Do not treat missing checks or reviews as successful gates without confirming the applicable repository rules.
- Do not claim a push, PR, or check result without reading it back.