Git Version Control
Expert instructions for managing source control operations and commit standards.
SKILL.md.claude/skills/git_version_control/SKILL.md
GitHubGit Version Control
This skill ensures consistent and clean version control practices.
Core Workflow
1. Staging & Committing
- Atomic Commits: Group related changes. Avoid massive "catch-all" commits.
- Message Format: Use conventional commit style if possible, or clear descriptive sentences.
feat: add emoji keyboardfix: resolve crash in settingsdocs: update skill usage guide
2. Branching
- Feature Branches:
feature/your-feature-name - Bugfix Branches:
bugfix/issue-description - Main Branch: Only merge stable code into
main(ormaster).
3. Merging
- Pull: Always pull latest changes before starting work.
- Conflicts: When resolving conflicts:
- Identify the conflicting file.
- Look for
<<<<<<<,=======,>>>>>>>markers. - Choose the correct code block (incoming vs. current).
- Remove markers and test.
Common Operations
Status Check
Allows seeing which files are changed/staged.
git status
Viewing History
See recent changes in a compact format.
git log --oneline -n 10
Discarding Local Changes
Warning: This is destructive. To reset a specific file to HEAD:
git checkout -- path/to/file