developer-ai 1.0.0

package/skills/git-workflow/SKILL.md

@@ -0,0 +1,448 @@
+---
+name: git-workflow
+description: Guide for effective Git workflows and conventions. Use when setting up branching strategies, writing commit messages, handling merges, resolving conflicts, or establishing team Git practices. Covers Git Flow, trunk-based development, and common Git operations.
+---
+
+# Git Workflow Skill
+
+This skill provides guidance for effective Git workflows, conventions, and best practices.
+
+## Overview
+
+A consistent Git workflow improves collaboration, makes history readable, and reduces merge conflicts. This skill covers branching strategies, commit conventions, and common operations.
+
+## Branching Strategies
+
+### Git Flow
+
+Best for: Projects with scheduled releases
+
+```
+main ─────●─────────●─────────●───────
+          │         ↑         ↑
+          │      merge     merge
+          ↓         │         │
+develop ──●────●────●────●────●───────
+               │         │
+               │     ┌───┴───┐
+               │     │feature│
+               │     └───────┘
+          ┌────┴────┐
+          │ release │
+          └─────────┘
+```
+
+**Branches:**
+- `main` - Production-ready code
+- `develop` - Integration branch
+- `feature/*` - New features
+- `release/*` - Release preparation
+- `hotfix/*` - Production fixes
+
+### Trunk-Based Development
+
+Best for: Continuous deployment, small teams
+
+```
+main ─────●────●────●────●────●─────
+          │    │    │    │    │
+          │    │    │    │    └──short-lived
+          │    │    │    └───────feature branch
+          │    │    └────────────(max 1-2 days)
+          │    └─────────────────
+          └──────────────────────
+```
+
+**Principles:**
+- Short-lived feature branches (< 2 days)
+- Frequent merges to main
+- Feature flags for incomplete work
+
+### GitHub Flow
+
+Best for: Continuous deployment, web applications
+
+```
+main ─────●─────────●─────────●───────
+          │         ↑         ↑
+          │      merge     merge
+          ↓    (via PR)  (via PR)
+feature ──●────●────●
+               │
+               └── commits
+```
+
+**Process:**
+1. Create branch from main
+2. Make changes, commit
+3. Open Pull Request
+4. Review and discuss
+5. Deploy and test
+6. Merge to main
+
+## Commit Conventions
+
+### Conventional Commits
+
+```
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+
+**Types:**
+- `feat` - New feature
+- `fix` - Bug fix
+- `docs` - Documentation only
+- `style` - Formatting, no code change
+- `refactor` - Code change, no feature/fix
+- `perf` - Performance improvement
+- `test` - Adding tests
+- `chore` - Build process, dependencies
+
+**Examples:**
+```
+feat(auth): add OAuth2 login support
+
+Add Google and GitHub OAuth providers.
+Users can now link multiple accounts.
+
+Closes #123
+```
+
+```
+fix(api): handle null response from payment API
+
+The payment API occasionally returns null for
+declined transactions. Added null check and
+proper error handling.
+
+Fixes #456
+```
+
+```
+refactor: extract validation logic to separate module
+
+No functional changes. Improves testability
+and reduces duplication.
+```
+
+### Good Commit Messages
+
+**Structure:**
+```
+Short summary (50 chars or less)
+
+More detailed explanation if needed. Wrap at 72 characters.
+Explain WHAT changed and WHY, not how.
+
+- Bullet points are okay
+- Use imperative mood ("Add feature" not "Added feature")
+
+Refs #123
+Fixes #456
+```
+
+**Examples:**
+
+```
+✓ Add user authentication to API endpoints
+✗ Added authentication
+✗ auth
+✗ Fixed stuff
+```
+
+## Common Operations
+
+### Start New Feature
+
+```bash
+# Update main
+git checkout main
+git pull origin main
+
+# Create feature branch
+git checkout -b feature/user-authentication
+
+# Work on feature...
+git add .
+git commit -m "feat(auth): add login endpoint"
+
+# Push and create PR
+git push -u origin feature/user-authentication
+```
+
+### Keep Branch Updated
+
+```bash
+# Option 1: Rebase (clean history)
+git fetch origin
+git rebase origin/main
+
+# Option 2: Merge (preserve history)
+git fetch origin
+git merge origin/main
+```
+
+### Squash Commits Before Merge
+
+```bash
+# Interactive rebase last 5 commits
+git rebase -i HEAD~5
+
+# In editor, change 'pick' to 'squash' for commits to combine
+pick abc1234 feat: add login form
+squash def5678 fix: form validation
+squash ghi9012 fix: typo
+squash jkl3456 style: formatting
+
+# Save, then edit combined commit message
+```
+
+### Fix Last Commit
+
+```bash
+# Amend last commit (not pushed)
+git add forgotten-file.js
+git commit --amend
+
+# Change just the message
+git commit --amend -m "New commit message"
+```
+
+### Undo Changes
+
+```bash
+# Undo unstaged changes
+git checkout -- file.js
+
+# Unstage files
+git reset HEAD file.js
+
+# Undo last commit (keep changes)
+git reset --soft HEAD~1
+
+# Undo last commit (discard changes)
+git reset --hard HEAD~1
+
+# Undo pushed commit (creates new commit)
+git revert abc1234
+```
+
+### Resolve Merge Conflicts
+
+```bash
+# During merge/rebase
+git status  # See conflicted files
+
+# Edit files to resolve conflicts
+# Look for:
+# <<<<<<< HEAD
+# Your changes
+# =======
+# Their changes
+# >>>>>>> branch-name
+
+# Mark as resolved
+git add resolved-file.js
+
+# Continue
+git merge --continue
+# or
+git rebase --continue
+```
+
+### Cherry-Pick Commits
+
+```bash
+# Apply specific commit to current branch
+git cherry-pick abc1234
+
+# Cherry-pick without committing
+git cherry-pick --no-commit abc1234
+
+# Cherry-pick range
+git cherry-pick abc1234..def5678
+```
+
+### Stash Changes
+
+```bash
+# Save work in progress
+git stash
+
+# Save with message
+git stash save "WIP: form validation"
+
+# List stashes
+git stash list
+
+# Apply most recent stash
+git stash pop
+
+# Apply specific stash
+git stash apply stash@{2}
+
+# Delete stash
+git stash drop stash@{0}
+```
+
+### Clean Up Branches
+
+```bash
+# Delete local branch
+git branch -d feature/old-feature
+
+# Delete remote branch
+git push origin --delete feature/old-feature
+
+# Prune remote-tracking branches
+git fetch --prune
+
+# Delete all merged local branches
+git branch --merged main | grep -v main | xargs git branch -d
+```
+
+## Git Hooks
+
+### Pre-commit Hook
+
+`.git/hooks/pre-commit`:
+```bash
+#!/bin/sh
+
+# Run linting
+npm run lint
+if [ $? -ne 0 ]; then
+  echo "Linting failed. Fix errors before committing."
+  exit 1
+fi
+
+# Run tests
+npm test
+if [ $? -ne 0 ]; then
+  echo "Tests failed. Fix tests before committing."
+  exit 1
+fi
+```
+
+### Commit Message Hook
+
+`.git/hooks/commit-msg`:
+```bash
+#!/bin/sh
+
+# Conventional commit format
+commit_regex='^(feat|fix|docs|style|refactor|perf|test|chore)(\(.+\))?: .{1,50}'
+
+if ! grep -qE "$commit_regex" "$1"; then
+  echo "Invalid commit message format."
+  echo "Use: type(scope): description"
+  exit 1
+fi
+```
+
+### Using Husky
+
+```json
+// package.json
+{
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
+  "lint-staged": {
+    "*.js": ["eslint --fix", "git add"]
+  }
+}
+```
+
+## Pull Request Best Practices
+
+### PR Description Template
+
+```markdown
+## Summary
+Brief description of changes
+
+## Type of Change
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Breaking change
+- [ ] Documentation update
+
+## Testing
+- [ ] Unit tests added/updated
+- [ ] Manual testing performed
+
+## Screenshots (if UI changes)
+
+## Checklist
+- [ ] Code follows style guidelines
+- [ ] Self-review completed
+- [ ] Documentation updated
+- [ ] No new warnings
+```
+
+### Code Review Guidelines
+
+**As Author:**
+- Keep PRs small (< 400 lines)
+- Write clear descriptions
+- Respond to feedback promptly
+- Don't take feedback personally
+
+**As Reviewer:**
+- Review promptly (< 24 hours)
+- Be constructive and specific
+- Approve when "good enough"
+- Block only for serious issues
+
+## Git Configuration
+
+```bash
+# User setup
+git config --global user.name "Your Name"
+git config --global user.email "you@example.com"
+
+# Default branch name
+git config --global init.defaultBranch main
+
+# Auto-setup remote tracking
+git config --global push.autoSetupRemote true
+
+# Pretty log format
+git config --global alias.lg "log --oneline --graph --decorate"
+
+# Rebase by default on pull
+git config --global pull.rebase true
+```
+
+## Workflow Checklist
+
+### Before Starting Work
+- [ ] Pull latest changes
+- [ ] Create branch from main/develop
+- [ ] Use descriptive branch name
+
+### During Development
+- [ ] Commit frequently
+- [ ] Write meaningful commit messages
+- [ ] Keep commits focused
+- [ ] Push regularly
+
+### Before Merging
+- [ ] Rebase/merge latest changes
+- [ ] Resolve conflicts
+- [ ] Squash if needed
+- [ ] Verify tests pass
+- [ ] Request review
+
+### After Merging
+- [ ] Delete feature branch
+- [ ] Verify deployment
+- [ ] Close related issues