Apply trunk-based development and conventional commits with GitHub integration.
npx skills add https://github.com/jkitchin/skillz --skill version-control
Please help me install this Agent Skill. Skill: version-control Source: https://github.com/jkitchin/skillz/tree/main/skills/development/version-control Command: npx skills add https://github.com/jkitchin/skillz --skill version-control
This Skill provides guidance on professional Git workflows, trunk-based development, conventional commits, PRs, branch management, and troubleshooting to keep projects healthy and deployable.
Follow daily workflow examples: update main, create a feature branch feat/..., commit with type(scope): message, rebase against main, push and create PR.
High-intent search queries and answers about installing and using this skill.
Trunk-based development maintains a deployable main branch with short-lived feature branches. Create feature branches from main, commit changes with conventional commit messages, then merge back via pull requests after review. This keeps your codebase stable and deployment-ready.
Conventional commits follow the format type(scope): message—for example, feat(auth): add login validation or fix(api): resolve timeout issue. This structured approach creates a clear, searchable commit history and enables automated changelog generation.
During a rebase, Git pauses at conflicting commits. Manually resolve conflicts in your editor, mark files as resolved with git add, then continue the rebase with git rebase --continue. For complex conflicts, you can abort with git rebase --abort and try a merge instead.
Yes. Configure branch protection rules to require PR reviews and passing CI/CD checks before merging. Use GitHub Actions to run tests, lint code, and validate commit messages automatically on every push, enforcing workflow consistency across your team.
Merge combines branches and preserves full history with a merge commit. Rebase replays your commits on top of another branch, creating a linear history. Rebase is cleaner for feature branches; merge is safer for shared branches and integrations.
Reference troubleshooting guidance for detached HEAD states, undoing commits, recovering deleted branches, and resolving stale branch conflicts. The Skill provides commands and recovery steps for frequent Git scenarios in daily development.
RedWoodOGConfigure GitHub authentication for Hermes Agent via git or gh CLI.
adryanmoldokkr32-pixelMerge pull requests, monitor CI, deploy to production, and verify health with canary checks.
GolferGeekStandardize GitHub branching, pull requests, code reviews, and CI/CD pipelines.
h4vzzManage Git repositories and collaborative workflows across GitHub, GitLab, and Bitbucket.
