skills.rest
filippolmt
filippolmtCOMMUNITY
Explore all skills by this author →
GitHub

resolving-merge-conflicts

Resolve in-progress git merge and rebase conflicts while preserving both change intents.

1|Updated Jul 2, 2026
Search Tags:#git#code review#version control#merge conflict#rebase#conflict resolution
One-click install
npx skills add https://github.com/filippolmt/skills --skill resolving-merge-conflicts-filippolmt
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolving-merge-conflicts
Source: https://github.com/filippolmt/skills/tree/main/skills/resolving-merge-conflicts
Command: npx skills add https://github.com/filippolmt/skills --skill resolving-merge-conflicts-filippolmt

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent behind one side of the change. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving every hunk correctly, and finishing the merge safely. ## Core Features & Use Cases - Intent-Driven Resolution: Traces each conflicting change back to its commit messages, PRs, and original issues before touching code. - Structured Five-Step Workflow: Inspects merge state, researches primary sources, resolves hunks, runs project checks (typecheck, tests, format), and completes the merge or rebase. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across several files. The Skill walks through each conflict, preserves both intents where possible, verifies the test suite passes, and continues the rebase to completion. ## Quick Start Resolve the current in-progress git merge conflict in this repository, preserving the intent of both branches and running the project's checks before committing.

Frequently Asked Questions about resolving-merge-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve a git merge conflict step by step?▼

First inspect the merge state and conflicting files, then research why each change was made via commits and PRs. Resolve each hunk preserving both intents where possible, run the project's typecheck and tests, then stage and commit to finish the merge.

How to resolve conflicts during a git rebase?▼

During a rebase, resolve each conflicting hunk as it appears, stage the resolved files, and continue the rebase until all commits are replayed. The Skill repeats this per commit rather than aborting the rebase.

Should I ever use git merge --abort when conflicts get messy?▼

This workflow explicitly avoids aborting: it always resolves conflicts rather than running --abort. If two intents are incompatible, it picks the one matching the merge's stated goal and notes the trade-off.

What checks should I run after resolving merge conflicts?▼

Run the project's automated checks in order: typically typecheck first, then the test suite, then formatting. Fix anything the merge broke before staging and committing the resolution.

How do I understand why a conflicting change was made?▼

Read the commit messages on both sides, check the associated pull requests, and look up the original issues or tickets. Understanding the original intent prevents accidentally discarding needed behavior during resolution.

Related Skills

Explore More Software Engineering Skills→
taxmaxitaxmaxi
1

resolving-merge-conflicts

Resolves in-progress git merge and rebase conflicts while preserving both change intents.

Official
Intermediate
vstorm-covstorm-co
1.0k

git-workflow

Manage git commits, branches, pull requests, and conflict resolution.

Official
Intermediate
cursorcursor
2.6k

fix-merge-conflicts

Resolve Git merge conflicts and validate builds with tests.

Official
Intermediate
shonenmshonenm
2

conflict-resolve

Resolve Git merge and rebase conflicts by analyzing base, ours, and theirs states.

Community
Advanced