skills.rest
MaiconGambini
MaiconGambiniCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolving-merge-conflicts

Resolve Git merge and rebase conflicts by tracing both sides' intent and verifying integration.

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merge and rebase conflicts stall development when it is unclear what each side of the conflict was trying to accomplish, leading to lost changes or broken integrations. ## Core Features & Use Cases - Intent Tracing: Reads commits, diffs, specs, and code on both sides of a conflict before editing anything. - Verified Resolution: Runs the project's typecheck, tests, and formatter after resolving each hunk to catch regressions. - Safe Completion: Completes the merge or rebase only after verification passes, and never aborts without explicit user direction. - Use Case: During a long-running feature branch rebase onto main, conflicting hunks in shared modules are resolved by preserving both intents, then validated with the project's test suite before continuing. ## Quick Start Resolve the current Git merge conflict by analyzing both sides' intent and verifying the result with the project's tests.

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 safely?▼

Inspect the merge state and list conflicting files, then read the commits and diffs on both sides to understand intent before editing. Resolve each hunk preserving both intents where compatible, then run typecheck, tests, and formatter before completing the merge.

How to resolve conflicts during a Git rebase?▼

During a rebase, examine each conflicting hunk against the commits being replayed and the target branch. Choose the behavior matching the rebase goal, record trade-offs, and continue the rebase only after verification succeeds.

Should I ever abort a merge or rebase with conflicts?▼

Aborting discards progress and should only happen with explicit user direction. If a conflict cannot be finished in the current session, hand off the state cleanly instead of aborting.

What should I check after resolving merge conflicts?▼

Run the project's discovered typecheck, test suite, and formatter to catch regressions introduced by the integration. Fix any failures caused by the resolution before completing the merge or rebase.

When is manual conflict resolution better than accepting one side?▼

Manual resolution is needed when both sides contain changes that must coexist, such as parallel edits to shared logic. Blindly accepting one side discards the other's intent and can silently drop functionality.

Related Skills

Explore More Software Engineering Skills→
mambo-wangmambo-wang
3

resolving-merge-conflicts

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

Community
Intermediate
codeaholicguycodeaholicguy
1.6k

dev-pr

Rebase, push, and open a code review request for a ready feature branch.

Community
Intermediate
VoDaiLoczVoDaiLocz
24

lint-and-validate

Automate linting and static analysis of code in CI pipelines.

Community
Intermediate
compozycompozy
2.7k

git-rebase

Resolve git rebase conflicts while preserving features and maintaining linear commit history.

Official
Advanced