commit

Category: Tools & Productivity | Uploader: ScienceOL | Downloads: 0 | Version: v1.0（Latest）

Git commit, push, and PR workflow for Xyzen. Use /commit before committing code, pushing branches, or creating pull requests. This skill ensures pre-commit checks run properly, commit messages follow conventional format, and PRs are well-structured. Invoke this whenever the user mentions committing, pushing, creating a PR, or any git workflow that modifies history.

Changelog: Source: GitHub https://github.com/ScienceOL/Xyzen

Directory Structure

Current level: .claude/skills/commit/

📄 SKILL.md 3.6 KB

SKILL.md

---
name: commit
description: "Git commit, push, and PR workflow for Xyzen. Use /commit before committing code, pushing branches, or creating pull requests. This skill ensures pre-commit checks run properly, commit messages follow conventional format, and PRs are well-structured. Invoke this whenever the user mentions committing, pushing, creating a PR, or any git workflow that modifies history."
user_invocable: true
---

# Git Commit, Push & PR Workflow

## Branch Strategy

```
feature/* ──PR──▶ test ──PR──▶ main
```

- **feature → test**: The standard workflow. All feature branches merge into `test` first.
- **test → main**: Promotion after validation on `test`.

PRs default to targeting `test` unless the user specifies otherwise.

## Commit

First, run `git status` to check the working tree. If there are other unstaged or untracked changes beyond what you're about to commit, ask the user what to do with them (stage together, leave for a separate commit, discard, etc.) before proceeding.

By default, commit directly and let pre-commit hooks run automatically. Only use the no-verify approach when the user explicitly requests it.

### Default: Direct commit

```bash
git add <specific-files>
git commit -m "<type>(<scope>): <description>"
```

Pre-commit hooks run automatically. If they fail, fix the issues and re-commit.

### Alternative: Pre-commit + no-verify (only when user asks)

Run checks separately for faster feedback, then skip the redundant hook run:

```bash
git add <specific-files>
just pre-commit-staged
# fix issues if any, re-run until clean
git commit --no-verify -m "<type>(<scope>): <description>"
```

Or check everything at once: `just pre-commit`.

### Common auto-fixes

- **ruff**: `just fmt-backend` (formatting) then `just lint-backend` (lint with auto-fix)
- **prettier**: `cd web && yarn prettier --write <files>`
- **eslint**: `just lint-web`
- **basedpyright / typescript**: Fix type errors manually

### Conventional commits

The `commitlint` hook enforces this format:

```
<type>(<scope>): <description>
```

**Types**: `feat`, `fix`, `refactor`, `chore`, `docs`, `test`, `perf`, `ci`, `style`, `build`

**Examples:**
```
feat(chat): add streaming retry with exponential backoff
fix(auth): handle expired JWT tokens in middleware
refactor(agents): extract prompt builder into separate module
chore(deps): bump langchain to 0.3.x
```

Scope is optional but encouraged — use the module or feature area name.

### Logical grouping

For large changesets, split into separate logical commits:
- Schema/model changes
- Service/business logic
- Tests
- Frontend separately from backend

## Push

- Feature branches: `git push -u origin <branch>`
- Never force-push to `main` without explicit user approval
- Confirm with the user before any push

## PR Creation

Use `gh pr create` targeting `test` by default:

```bash
gh pr create --base test --title "<type>(<scope>): short description" --body "$(cat <<'EOF'
## Summary
- What changed and why

## Test plan
- [ ] Verification steps

🤖 Generated with [Claude Code](https://claude.com/claude-code)
EOF
)"
```

There is also a shortcut: `just pr` (targets test) or `just pr main`.

Before creating:
1. `git log test..HEAD` — review all commits that will be in the PR
2. Make sure branch is pushed
3. No WIP or fixup commits left — squash or reword if needed
4. Check for merge conflicts with the target branch:
   ```bash
   git fetch origin test
   git merge --no-commit --no-ff origin/test
   ```
   - If it merges cleanly, abort the test merge: `git merge --abort`
   - If there are conflicts, resolve them and commit the merge before creating the PR

Comments 0

Latest | Hot

Please login before commenting.

No comments yet. Be the first one!

commit

Directory Structure

SKILL.md

Report

Notice