Automation
Skill
/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Claude Code
$ npx -y skills add gtapps/hermitd --skill resolving-merge-conflicts --agent claude-code
Codex
$ npx skills add gtapps/hermitd --skill resolving-merge-conflicts -a codex -y
Cursor
$ npx skills add gtapps/hermitd --skill resolving-merge-conflicts -a cursor -y
Gemini CLI
$ npx skills add gtapps/hermitd --skill resolving-merge-conflicts -a gemini-cli -y
GitHub Copilot
$ npx skills add gtapps/hermitd --skill resolving-merge-conflicts -a github-copilot -y
OpenCode
$ npx skills add gtapps/hermitd --skill resolving-merge-conflicts -a opencode -y
Windsurf
$ npx skills add gtapps/hermitd --skill resolving-merge-conflicts -a windsurf -y
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 withhermitd
Run an always-on Claude Code agent on your own machine, for you or your team. Start sessions from your chat in any project it can reach, on the model and effort you choose, and steer them through the agent or take over in the Claude app or CLI.
8288 skills12 agents
Stars on GitHub
Momentum
- stars in total
- 82
Other skills on hermitd.
More skills from other plugins.
browser-use
Direct browser control via CDP for web interaction: automation, scraping, testing, screenshots, and site/app work. Also covers…
@browser-useInstall Skillagent-browser
Browser automation CLI for AI agents. Use when the user needs to interact with websites, including navigating pages, filling…
@vercel-labs-2Install Skill
Questions about resolving-merge-conflicts.
- Which coding agents can use resolving-merge-conflicts?
- resolving-merge-conflicts installs in Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode and Windsurf with the skills CLI, using each agent's flag shown on this page. Flowy's auto-invocation, which fires a skill when your prompt matches, runs in Claude Code only.