resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Skill by dotlas
Install
Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.
npx agentmarket install skill/dotlas-resolving-merge-conflicts
Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.
Get the weekly diff
The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.
About
Reviews
Write a reviewNo reviews yet. Installed it? Reviews come from verified installers only. How reviews work
Permissions
What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.
- Tools
- No tools found
- Secrets
- None asked for
- Install scripts
- None found
Network hosts it talks to 1
codeload.github.com· found in install command
Files it touches
~/.claude/skills/resolving-merge-conflicts
What's inside
- Skill name
resolving-merge-conflicts- Description
- Use when you need to resolve an in-progress git merge/rebase conflict.
- License
- MIT
- Instructions
- 18 lines in SKILL.md · view on GitHub
Files (2)
- SKILL.md
- openai.yaml · agents/
SKILL.md (first lines)
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.
From dotlas/skills, MIT.
More from dotlas/skills
- 0.507score
codebase-integrity
dotlas
Audit the codebase for dependency conflicts, loose types, duplicated patterns, and import boundary violations.
SkillCFreshness: C★ 2Claude Code +9 - 0.507score
tidy-next-codebase
dotlas
Audit a Next.js codebase for stale/dead code and duplication, turn the findings into a fully deterministic cleanup plan, then execute it as a gated…
SkillCFreshness: C★ 2Claude Code +9 - 0.507score
import-skill
dotlas
Import a third-party skill into this owned catalog (dotlas/skills) from a skills.sh URL, a GitHub repo/subdir, or a pasted `npx skills add` command.
SkillCFreshness: C★ 2Claude Code +9 - 0.507score
commit
dotlas
Commit local changes — inspect the working tree, group into atomic conventional commits, and write messages that match the repo's conventions.
SkillCFreshness: C★ 2Claude Code +9 - 0.487score
impeccable
dotlas
Use when the user wants to design, redesign, shape, critique, audit, polish, clarify, distill, harden, optimize, adapt, animate, colorize, extract, or…
SkillCFreshness: C★ 2Claude Code +9 - 0.479score
improve-codebase-architecture
dotlas
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
SkillCFreshness: C★ 2Claude Code +9 - 0.477score
grilling
dotlas
Grill the user relentlessly about a plan, decision, or idea.
SkillCFreshness: C★ 2Claude Code +9 - 0.476score
teach
dotlas
Teach the user a new skill or concept, within this workspace.
SkillCFreshness: C★ 2Claude Code +9 - 0.471score
handoff
dotlas
Compact the current conversation into a handoff document for another agent to pick up.
SkillCFreshness: C★ 2Claude Code +9 - 0.350score
vercel-react-best-practices
vercel
React and Next.js performance optimization guidelines from Vercel Engineering.
SkillCFreshness: C★ 2Claude Code +9
Signals
- Stars
- 2
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- Jul 23, 2026 (3 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/dotlas/skills
- Website
- www.skills.sh/dotlas/skills
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from dotlas
- 0.507score
commit
dotlas
Commit local changes — inspect the working tree, group into atomic conventional commits, and write messages that match the repo's conventions.
SkillCFreshness: C★ 2Claude Code +9 - 0.507score
tidy-next-codebase
dotlas
Audit a Next.js codebase for stale/dead code and duplication, turn the findings into a fully deterministic cleanup plan, then execute it as a gated…
SkillCFreshness: C★ 2Claude Code +9 - 0.507score
import-skill
dotlas
Import a third-party skill into this owned catalog (dotlas/skills) from a skills.sh URL, a GitHub repo/subdir, or a pasted `npx skills add` command.
SkillCFreshness: C★ 2Claude Code +9 - 0.507score
codebase-integrity
dotlas
Audit the codebase for dependency conflicts, loose types, duplicated patterns, and import boundary violations.
SkillCFreshness: C★ 2Claude Code +9 - 0.487score
impeccable
dotlas
Use when the user wants to design, redesign, shape, critique, audit, polish, clarify, distill, harden, optimize, adapt, animate, colorize, extract, or…
SkillCFreshness: C★ 2Claude Code +9 - 0.479score
improve-codebase-architecture
dotlas
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
SkillCFreshness: C★ 2Claude Code +9
Cite this page
resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/dotlas-resolving-merge-conflicts (last updated 2026-10-24)