Agent skill
git-automator
Automates git workflow - sync, branch management, conflict resolution, smart commits, and PRs. Integrates with feature development cycle.
Install this agent skill to your Project
npx add-skill https://github.com/majiayu000/claude-skill-registry/tree/main/skills/other/other/git-automator
SKILL.md
Git Automator (Feature Development Integration)
Automates the entire git workflow integrated with the feature development cycle.
Prerequisites
gitandgh(GitHub CLI) installed
Integration with Feature Cycle
Phase 4: BRANCH
# Check current branch
git branch --show-current
# If on main/master, create feature branch
git checkout main
git pull origin main
git checkout -b feature/XXX-name
Phase 5: IMPLEMENT (Commit Workflow)
For each completed task:
# 1. Check status
git status
# 2. Stage changes
git add [specific files for this task]
# 3. Commit with feature prefix
git commit -m "FEAT-XXX: Complete Task N - description"
# 4. Every 30 min or 3 tasks: push
git push origin feature/XXX-name
Phase 6: PR Creation
# Push final changes
git push -u origin HEAD
# Create PR
gh pr create \
--title "FEAT-XXX: Feature Name" \
--body "## Summary..." \
--base main
Conflict Resolution Protocol
IF CONFLICTS OCCUR:
-
Identify conflicts:
bashgit status -
Inform user: "Conflicts detected in: [list files]"
-
Offer assistance: "Do you want me to read these files and help you choose which version to keep?"
-
WAIT for user instruction on each file
-
Resolve and continue:
bashgit add [resolved_file] git rebase --continue
Smart Commit Messages
Format
FEAT-XXX: [Action] [Component] - [Brief description]
Examples
FEAT-001: Add User model with validation
FEAT-001: Create auth service with JWT support
FEAT-001: Add login endpoint and tests
FEAT-002: Fix dashboard layout on mobile
Rules
- Keep under 72 characters
- Start with feature ID
- Use present tense ("Add" not "Added")
- NO emojis unless user requests
- NO automatic co-author tags
Quick Reference
# Start feature
git checkout -b feature/XXX-name
# During implementation
git add [files]
git commit -m "FEAT-XXX: description"
git push origin feature/XXX-name
# Create PR
gh pr create --fill --base main
# After merge
git checkout main
git pull
git branch -d feature/XXX-name
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
Didn't find tool you were looking for?