Install in seconds

Install this skill

Copy the command and run it in your terminal. You can review the source before installing.

terminal

git clone https://github.com/tt-a1i/matt-skills-with-to-goal

Works with Git. The repository opens in your current directory.

🤝

DevOpsShell

Resolving Merge Conflicts

Resolves in-progress git merge or rebase conflicts by identifying primary sources, preserving intent, and running automated checks. Use when you need to finish a merge or rebase without aborting.

14 stars3 forksAdded 2026/07/16

View source on GitHub Download ZIP

agent-skillsai-agentsclaude-codecodexcoding-agentsdeveloper-toolsworkflow

Documentation

README

From the original repository

See the current state of the merge/rebase. Check git history, and the conflicting files.
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.
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.
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

More from tt-a1i

Other Claude Code skills by this author in the directory.

Ask Matt

A router that helps determine which skill or workflow to use for a given task. Use when you need guidance picking the right tool from a suite of AI agent skills.

Code Review

Reviews code changes since a fixed point along two independent axes: coding standards compliance and spec/issue fidelity. Runs both reviews in parallel sub-agents and reports findings side by side. Ideal for reviewing branches, PRs, or work-in-progress changes.

Codebase Design

A shared vocabulary and principles for designing deep, testable modules with small interfaces and high leverage. Use when designing or improving module interfaces, deciding where to place seams, or making code more maintainable and AI-navigable.

Diagnosing Bugs

Guides systematic debugging of hard bugs and performance regressions through building a tight feedback loop, reproducing, minimizing, hypothesizing, and instrumenting. Use when encountering difficult or flaky bugs.

Domain Modeling

Actively builds and sharpens a project's domain model, challenging vague terms, stress-testing concepts with edge cases, and capturing glossaries and architectural decisions (ADRs) as they crystallize.

Goal Crafter

Craft verifiable goal prompts for AI coding agents like Claude Code, Codex, or Pi. Turns vague tasks into precise goals with checkable completion criteria, ensuring agents run unattended.

More DevOps skills

Resolving Merge Conflicts is one of 80 DevOps skills cataloged on DirSkills.

Browse all DevOps skills →

License to Audit

Performs comprehensive security audits, threat modeling (STRIDE/PASTA), red/blue team analysis, OWASP checks, code review, incident response, and infrastructure security assessments.

Add App Clip

Adds an iOS App Clip target to an Expo project, allowing a lightweight version of the app to be invoked via URL. Handles associated domains, AASA file hosting, and smart app banner setup.

Vercel Optimize

Audit deployed Vercel apps for cost and performance issues using production metrics, project configuration, code scans, and version-aware recommendations.