resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Skill by transitive-bullshit
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/transitive-bullshit-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
- 11 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. Continue toward the requested merge or rebase. Do not abort it unless the user requests that change of intent. 4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke. 5. **Finish the requested merge/rebase.** Stage the resolution files while preserving unrelated local changes. Commit the merge or continue the rebase until its commits are resolved, following the user’s requested Git workflow.
From transitive-bullshit/skills, MIT.
More from transitive-bullshit/skills
- 0.606score
better-ui
transitive-bullshit
Polishes the surfaces, icons and motion in your project with exact values for border radius, optical alignment, shadows, icon states and animation.
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-layout
transitive-bullshit
Helps with grouping, alignment, reading order, responsive structure and room for translated text, so a layout holds up when it is resized, translated or…
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-typography
transitive-bullshit
Sets and reviews how text renders in your product, from the type scale and spacing to font features, wrapping, truncation and punctuation.
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-writing
transitive-bullshit
Writes and reviews your interface copy, from labels and errors to empty states and confirmations, so it matches your product's voice and tells people what to…
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-accessibility
transitive-bullshit
Reviews and fixes keyboard and focus behavior, ARIA, accessible names, forms, screen-reader announcements, motion and zoom in your project against WCAG 2.2.
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-colors
transitive-bullshit
Helps you build and check a color system for your project.
SkillAFreshness: A★ 4Claude Code +9 - 0.582score
create-verification-skill
transitive-bullshit
Generate a project-local verification skill that drives your app the way a user does — any language, framework, or platform.
SkillAFreshness: A★ 4Claude Code +9 - 0.580score
domain-modeling
transitive-bullshit
Build and sharpen a project's domain model.
SkillAFreshness: A★ 4Claude Code +9 - 0.580score
codebase-design
transitive-bullshit
Shared vocabulary for designing deep modules.
SkillAFreshness: A★ 4Claude Code +9 - 0.577score
testing-strategy
transitive-bullshit
Choose proportionate verification and maintain useful tests when implementing changes, fixing bugs, or reviewing test coverage.
SkillAFreshness: A★ 4Claude Code +9
Signals
- Stars
- 4
- Forks
- 1
- Open issues
- 0
- Last commit (this folder)
- Oct 11, 2026 (17 days ago)
- Last release
- Sep 6, 2026 (1 month ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/transitive-bullshit/skills
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from transitive-bullshit
- 0.606score
better-ui
transitive-bullshit
Polishes the surfaces, icons and motion in your project with exact values for border radius, optical alignment, shadows, icon states and animation.
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-layout
transitive-bullshit
Helps with grouping, alignment, reading order, responsive structure and room for translated text, so a layout holds up when it is resized, translated or…
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-typography
transitive-bullshit
Sets and reviews how text renders in your product, from the type scale and spacing to font features, wrapping, truncation and punctuation.
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-writing
transitive-bullshit
Writes and reviews your interface copy, from labels and errors to empty states and confirmations, so it matches your product's voice and tells people what to…
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-accessibility
transitive-bullshit
Reviews and fixes keyboard and focus behavior, ARIA, accessible names, forms, screen-reader announcements, motion and zoom in your project against WCAG 2.2.
SkillAFreshness: A★ 4Claude Code +9 - 0.606score
better-colors
transitive-bullshit
Helps you build and check a color system for your project.
SkillAFreshness: A★ 4Claude Code +9
Cite this page
resolving-merge-conflicts skill. Agent Mart. https://agentmart.dev/skills/transitive-bullshit-resolving-merge-conflicts (last updated 2026-10-24)