Skill
bump-core-req
Updates the minimum core version requirement for a fleet plugin in all three canonical places: `required_core_version` and `requires["claude-code-hermit"]` in…
@gtappsView SkillAutomation
Skill
/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Install
$ npx -y skills add gtapps/claude-code-hermit --skill resolving-merge-conflicts --agent claude-codeHow it fires
How this skill gets triggered: by you, by Claude, or both.
- Fires itselfAuto-invocation. Claude auto-loads it when your prompt matches the work.Auto-invocation is when the right skill fires by itself at the right moment, driven by a FLOW.md router and a hook, instead of you invoking it by name. It is the difference between a skill being installed and a skill actually getting used.Read the full definition →
- You can call itInvoke it directly when you want it.
- Slash command
/resolving-merge-conflicts
Context preview
The summary Claude sees to decide when to auto-load this skill.
Use when you need to resolve an in-progress git merge/rebase conflict.
SKILL.md
resolving-merge-conflicts.SKILL.mdname: resolving-merge-conflicts description: "Use when you need to resolve an in-progress git merge/rebase conflict."
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
---
*Adapted from [mattpocock/skills](https://github.com/mattpocock/skills) (MIT, Copyright 2026 Matt Pocock)*
Ships withclaude-code-hermit
Run an always-on Claude Code agent on your machine or server, for you or your team. Use it from your terminal or the Claude app via Remote Control, or connect Discord, Telegram, iMessage, or a custom Claude Code channel.
Get the whole plugin
Stats
74
Stars
15
Forks
Active
Maintenance
TypeScript
Language
MIT
License
4d ago
Last commit
5mo ago
Created
Repo: gtapps/claude-code-hermit
Other skills on claude-code-hermit.
@gtappsView SkillSkill
commit
Changelog and commit — lightweight motion for day-to-day plugin dev work in the monorepo. One commit per plugin scope; CHANGELOG and staging routed by detected…
@gtappsView SkillSkill
docs-drift
Documentation-drift audit for the plugin monorepo. Audits either each scoped plugin's unreleased changelog claims or its latest shipped release from the…
@gtappsView SkillSkill
downstream-impact
Explain in plain language what a fix, feature, PR, or plan will actually change for downstream hermits and the operators chatting with them — a before/after…
@gtappsView SkillSkill
fleet-release
Use this skill whenever the user wants to release, ship, prep, or cut versions for two or more plugins together on the current branch. Trigger on phrasings…
@gtappsView SkillSkill
pipeline-digest
Daily release-pipeline digest with a change gate — reports which plugins are pending release, whether main's CI is green, which branches went stale, and GitHub…
@gtappsView Skill