skills.rest
nseng-ai
nseng-aiOFFICIAL
Explore all skills by this author →
GitHub

pocock-resolving-merge-conflicts

Resolves in-progress git merge and rebase conflicts by tracing original change intent.

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Resolving git merge and rebase conflicts is error-prone when you don't understand why each side changed the code, often leading to lost work or silently broken behavior. ## Core Features & Use Cases - Intent-Driven Resolution: Traces each conflicting change back to its commit messages, PRs, and original issues before touching any hunk. - Hunk-by-Hunk Resolution: Preserves both sides' intent where possible, and documents trade-offs when intents are incompatible. - Verification and Completion: Runs the project's typecheck, tests, and formatting after resolving, then stages, commits, and continues the rebase to completion. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across several files. The skill inspects the history behind each conflict, resolves every hunk faithfully, runs the test suite, and finishes the rebase. ## Quick Start Resolve the current in-progress git merge conflict in this repository, preserving the intent of both sides and running the project checks before committing.

Frequently Asked Questions about pocock-resolving-merge-conflicts

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

FAQPage Schema
How do I resolve git merge conflicts without losing changes?▼

Resolve each conflicting hunk by first understanding why both sides changed the code, using commit messages, PRs, and original issues. Preserve both intents where possible, and where they conflict, follow the merge's stated goal while noting the trade-off.

How to continue a git rebase after fixing conflicts?▼

After resolving all conflicting hunks, stage the resolved files and continue the rebase until every commit is replayed. Run the project's typecheck, tests, and formatter first to confirm the resolution did not break anything.

Should I ever abort a merge instead of resolving conflicts?▼

This skill always resolves and never aborts the merge or rebase. It resolves every hunk based on original intent rather than abandoning the operation, even when the two sides are incompatible.

What checks should I run after resolving merge conflicts?▼

Discover the project's automated checks and run them in order: typically typecheck first, then tests, then formatting. Fix anything the merge broke before staging and committing the resolution.

Why do merge conflicts happen during a rebase?▼

Conflicts occur when both branches modified the same lines or nearby code in incompatible ways. Understanding the original intent behind each change, via commit history and linked issues, is key to resolving them correctly.

Related Skills

Explore More Software Engineering Skills→
bnfergusonbnferguson

resolving-merge-conflicts

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

Community
Intermediate
vstorm-covstorm-co
1.0k

git-workflow

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

Official
Intermediate
MaksymilianCzadowskiMaksymilianCzadowski

resolving-merge-conflicts

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

Community
Intermediate
shonenmshonenm
2

conflict-resolve

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

Community
Advanced