Skills git-workflow
📦

git-workflow

Safe

Master Git Workflows with Confidence

Also available from: 0xDarkMatter,0xDarkMatter,Joseph OBrien,Cain96,Joseph OBrien,Barnhardt-Enterprises-Inc,AI-Vibe-Prompts,Doyajin174

Struggling with Git branches, merges, and conflicts? This skill provides clear, step-by-step guidance for all Git operations with best practices for team collaboration.

Supports: Claude Codex Code(CC)
📊 71 Adequate
1

Download the skill ZIP

2

Upload in Claude

Go to Settings → Capabilities → Skills → Upload skill

3

Toggle on and start using

Test it

Using "git-workflow". Write a commit message for adding login functionality

Expected outcome:

feat(auth): implement user login system

- Add login form component with validation
- Create authentication API endpoint
- Integrate session management middleware
- Add unit tests for login flow

Closes #156

Using "git-workflow". How do I undo my last commit but keep my changes?

Expected outcome:

Use: git reset --soft HEAD~1

This removes the commit but keeps all changes staged. If you want to unstage them too, use: git reset HEAD~1

Security Audit

Safe
v2 • 3/9/2026

This skill is a documentation-only guide for Git workflows. Static analysis flagged 77 shell command patterns, 6 URLs, and 14 crypto patterns, but all are false positives. The detected patterns are Markdown code blocks (```bash) and inline code markers (`command`) used for documentation formatting, not executable code. URLs are reference links to official Git documentation. No actual security risks exist.

2
Files scanned
550
Lines analyzed
0
findings
2
Total audits
No security issues found
Audited by: claude View Audit History →

Quality Score

38
Architecture
100
Maintainability
85
Content
35
Community
100
Security
87
Spec Compliance

What You Can Build

New Developer Onboarding

Help junior developers learn proper Git workflows with guided examples for branching, committing, and merging code safely.

Team Workflow Standardization

Establish consistent commit message formats and branch naming conventions across your development team.

Conflict Resolution Assistance

Get clear step-by-step guidance when facing complex merge conflicts during feature integration.

Try These Prompts

Basic Commit Message 
Help me write a commit message for changes that add user authentication with JWT tokens to my application.
Branch Creation and Setup 
I need to start working on a new feature for the shopping cart. What branch should I create and how?
Merge Conflict Resolution 
I'm getting conflicts when rebasing my feature branch onto main. Walk me through resolving them step by step.
Interactive Rebase for Cleanup 
I have 5 messy commits on my feature branch. Help me squash and reorganize them before merging to main.

Best Practices

  • Write small, focused commits that change one thing at a time
  • Use conventional commit format: type(scope): subject
  • Always pull latest changes before starting new work
  • Never commit directly to the main branch
  • Delete feature branches after merging to keep history clean

Avoid

  • Committing with messages like 'fix' or 'update' - be specific about what changed
  • Using git push --force without --force-with-lease - can overwrite teammate work
  • Committing large batches of unrelated changes - makes review and rollback difficult
  • Ignoring merge conflicts and forcing pushes - leads to lost code

Frequently Asked Questions

What is the difference between git merge and git rebase?
Merge creates a new commit combining two branches, preserving history. Rebase rewrites commit history by replaying commits on top of another branch, creating a linear history. Use merge for shared branches, rebase for local feature cleanup.
How do I undo a commit that was already pushed?
Use git revert <commit-hash> to create a new commit that undoes the changes. This is safer than reset for shared branches because it preserves history and does not require force push.
What should I do if I committed to the wrong branch?
Create a new branch from your current state with git branch correct-branch. Then reset the wrong branch with git reset --hard HEAD~1. Finally, checkout your correct branch.
How often should I pull changes from main?
Pull from main at least daily when working on long-running features. This reduces merge conflicts by keeping your branch current with team changes.
What is git stash and when should I use it?
Git stash temporarily saves uncommitted changes so you can switch branches. Use it when you need to quickly switch context but are not ready to commit your work.
What are conventional commits and why use them?
Conventional commits use a standard format: type(scope): description. Types include feat, fix, docs, refactor, test, and chore. This creates clear history and enables automated changelog generation.

Developer Details

License

MIT

Repository

https://github.com/supercent-io/skills-template/tree/main/.agent-skills/git-workflow/

Ref

main

File structure

📄 SKILL.md

📄 SKILL.toon