メニュー
Expert in Git workflows, branching strategies, commit conventions, and code review practices. Use when managing branches, creating commits, resolving conflicts, or following team git conventions.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Expert in MongoDB operations, database schema design, and data modeling for this SAT prep platform. Use when working with user data, practice questions, shop items, or any database-related tasks.
Expert in frontend design, UI/UX patterns, and creating visually appealing interfaces for this SAT prep platform. Use when building components, designing pages, or improving user experience.
Expert in Next.js 15, React 18, and TypeScript development. Use when building pages, API routes, components, or debugging Next.js applications. Handles App Router, Server Actions, middleware, and Next.js configuration.
Expert in testing strategies, test setup, and best practices for this Next.js/React application. Use when writing tests, debugging test failures, or improving test coverage.
| name | git-workflow |
| description | Expert in Git workflows, branching strategies, commit conventions, and code review practices. Use when managing branches, creating commits, resolving conflicts, or following team git conventions. |
Expert guidance for Git operations and workflow best practices.
main - Production-ready codedevelop or feature branches - Development workfeat/description, fix/description, chore/descriptionFollow conventional commits:
<type>(<scope>): <subject>
<body>
<footer>
Types:
| Type | Description |
|---|---|
feat | New feature |
fix | Bug fix |
docs | Documentation changes |
style | Code style (formatting, semicolons) |
refactor | Code refactoring |
test | Adding/updating tests |
chore | Maintenance tasks |
Examples:
feat(auth): add Google OAuth login
fix(practice): correct question answer display
docs(readme): update installation instructions
chore(deps): upgrade Next.js to 15.1.0
PR Naming:
feat: add new featurefix: resolve issue with XPR Description Template:
## Summary
Brief description of changes
## Changes
- List of specific changes made
## Testing
How was this tested?
## Screenshots (if UI changes)
Before/After images
# Create feature branch
git checkout -b feat/my-new-feature
# Or from main
git checkout main && git pull origin main
git checkout -b feat/my-new-feature
# Fetch latest
git fetch origin
# Rebase onto main
git rebase origin/main
# Or merge main into branch
git merge origin/main
# Stage specific files
git add src/app/page.tsx src/components/Button.tsx
# Stage all changes
git add .
# Commit with message
git commit -m "feat(auth): add sign-in component"
# Amend last commit (if not pushed)
git commit --amend -m "feat(auth): add sign-in component with validation"
# Recent commits
git log --oneline -10
# Changes in last commit
git show HEAD
# Search commits
git log --grep="fix" --oneline
# File history
git log --follow --oneline path/to/file.ts
# Unstage a file
git restore --staged path/to/file.ts
# Discard local changes to file
git checkout -- path/to/file.ts
# Or
git restore path/to/file.ts
# Revert a commit (creates new commit)
git revert HEAD
# Reset to previous commit (careful!)
git reset --soft HEAD~1 # Keep changes staged
git reset --mixed HEAD~1 # Keep changes unstaged
git reset --hard HEAD~1 # Discard changes (DANGEROUS)
# Push new branch
git push -u origin feat/my-feature
# Push to update remote
git push
# Fetch and merge
git pull origin main
# Fetch only
git fetch origin
# Start rebase
git rebase origin/main
# When conflict occurs, edit files to resolve
# Then:
git add <resolved-files>
git rebase --continue
# Or abort
git rebase --abort
git merge origin/main
# Resolve conflicts in editor
# Then:
git add .
git commit -m "merge: resolve conflicts with main"
<<<<<<< HEAD
Your changes
=======
Incoming changes
> > > > > > > branch-name
Keep both changes, remove markers:
Combined changes here
For this Next.js project, ensure these are ignored:
# Dependencies
node_modules/
# Build output
.next/
out/
build/
# Environment
.env
.env.local
.env.*.local
# IDE
.idea/
.vscode/
# OS
.DS_Store
Thumbs.db
# Logs
*.log
npm-debug.log*
# Testing
coverage/
# Misc
*.pem
This project uses Husky for pre-commit hooks. Config is in .husky/.
# Install Husky
pnpm prepare
# Skip hooks (not recommended)
git commit --no-verify -m "message"
git push --force-with-lease if needed