dsivov/git-workflow
.claude/skills/git-workflow/SKILL.md
Use when the Integrator is performing git operations — committing, branching, merging feature branches, resolving conflicts, managing branch lifecycle, or maintaining commit history. Activates for any git-related work.
data-ai
Updated Apr 16, 2026
$ install --global
skillsauthnpx skillsauth add dsivov/ai_development_team git-workflowInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 16, 2026, 2:51 PM4.3s1 file scanned
SKILL.md
- name:
- git-workflow
- description:
- Use when the Integrator is performing git operations — committing, branching, merging feature branches, resolving conflicts, managing branch lifecycle, or maintaining commit history. Activates for any git-related work.
- version:
- 1.0.0
Git Workflow Expertise
When This Applies
Apply this guidance when:
- Creating or managing branches
- Committing and pushing changes
- Merging feature branches into development
- Resolving merge conflicts
- Managing commit history
Branch Management
Branch Naming
- Feature branches:
feature/CR-NNN-short-description - Hotfix branches:
hotfix/NNN-short-description - Keep names lowercase with hyphens
- Always include the CR or issue number
Branch Lifecycle
1. Create: git checkout -b feature/CR-001-user-auth development
2. Work: Multiple commits as work progresses
3. Update: git merge development (keep in sync)
4. Test: Run ALL tests before final merge
5. Merge: git checkout development && git merge --no-ff feature/CR-001-user-auth
6. Cleanup: git branch -d feature/CR-001-user-auth
Keeping Branches Current
Regularly sync feature branches with development:
git checkout feature/CR-001-user-auth
git merge development
# Resolve any conflicts
# Run tests to verify
Commit Practices
Commit Message Format
[TASK-NNN] Brief description of what changed
Optional longer description explaining:
- Why this change was made
- What approach was taken
- Any notable decisions
Commit Guidelines
- Atomic commits — Each commit should be one logical change
- Meaningful messages — "Fix bug" is bad; "[TASK-042] Fix null reference in auth token validation" is good
- Never commit broken code — All tests must pass before committing
- Reference the task — Always include the TASK-NNN in the commit message
- No merge commits in feature branches — Use
mergeonly when merging to development
What to Include in a Commit
- Source code changes related to the task
- Related configuration changes
- Updated documentation if behavior changed
What NOT to Commit
- Debug logging or temporary code
- IDE settings or personal configuration
- Unrelated changes (even if they're improvements)
- Files with secrets, tokens, or credentials
Merge Conflict Resolution
Process
- Identify conflicting files:
git status - For each conflict:
- Read BOTH sides of the conflict
- Understand the intent of each change
- Choose the correct resolution (may be a combination)
- Remove all conflict markers (
<<<<,====,>>>>)
- Run tests after resolving all conflicts
- Commit the merge
Conflict Prevention
- Sync feature branches with development frequently
- Communicate with other roles about shared file changes
- Keep changes focused — large diffs create more conflicts
Pre-Merge Checklist (feature → development)
- [ ] All tests pass on the feature branch
- [ ] Feature branch is up to date with development
- [ ] No unresolved merge conflicts
- [ ] Commit messages reference task IDs
- [ ] No debug code or temporary files
- [ ] Changes match the task scope (no extras)
- [ ] Notify Manager after successful merge
Related Skills
dsivov/test-engineering
development
VerifiedTrustedCommunity
Use when the Integrator is writing unit tests, e2e tests, designing test strategies, improving test coverage, creating test fixtures, or mocking dependencies. Activates for any testing-related work including TDD, test refactoring, or test debugging.
SKILL.mdUpdated Apr 16, 2026
dsivov/task-decomposition
development
VerifiedTrustedCommunity
Use when the Architect is breaking down change requests into implementable tasks, defining acceptance criteria, estimating task size, mapping dependencies, or creating technical sub-tasks for Developer and Integrator.
SKILL.mdUpdated Apr 16, 2026
dsivov/system-design
development
VerifiedTrustedCommunity
Use when the Architect is designing system architecture, choosing technology stacks, defining data models, designing APIs, making scalability decisions, or updating ARCHITECTURE.md. Activates for any architecture design, technology evaluation, or system structure discussion.
SKILL.mdUpdated Apr 16, 2026
dsivov/stakeholder-communication
documentation
VerifiedTrustedCommunity
Use when the Manager is writing status updates, daily reports, queue messages to team members, escalation notices, or cross-role coordination messages. Activates when composing any team communication, reports, or documentation updates.
SKILL.mdUpdated Apr 16, 2026