skills.rest
Sir-chawakorn
Sir-chawakornCOMMUNITY
Explore all skills by this author →
GitHub

resolve-merge-rebase-conflict

Resolve git merge, rebase, and cherry-pick conflicts by combining code hunks.

9|3|Updated Jun 13, 2026
Search Tags:#git#debugging#version control#merge#rebase#conflict resolution
One-click install
npx skills add https://github.com/Sir-chawakorn/sanook-cli --skill resolve-merge-rebase-conflict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-merge-rebase-conflict
Source: https://github.com/Sir-chawakorn/sanook-cli/tree/main/skills/resolve-merge-rebase-conflict
Command: npx skills add https://github.com/Sir-chawakorn/sanook-cli --skill resolve-merge-rebase-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill resolves non-trivial merge, rebase, and cherry-pick conflicts by analyzing intent rather than just clearing markers, ensuring the resulting code is semantically correct and build-ready.

Core Features & Use Cases

  • Semantic Conflict Resolution: Handles complex scenarios like rename/rename, modify/delete, and add/add conflicts by combining logic from both branches.
  • Safety Guardrails: Provides a structured workflow to verify resolutions through build and test cycles, preventing broken code from being committed.
  • Use Case: When a long-lived feature branch encounters massive conflicts during a rebase, this skill guides you through identifying the common ancestor, merging logic correctly, and verifying the final state.

Quick Start

Use the resolve-merge-rebase-conflict skill to guide me through resolving the current git merge conflicts in my repository.

Frequently Asked Questions about resolve-merge-rebase-conflict

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

FAQPage Schema
How do I resolve complex git merge conflicts by combining logic from both branches?▼

Resolving complex git merge conflicts requires analyzing branch intent rather than just clearing markers. This skill combines code hunks semantically, ensuring the resulting integrated code is build-ready and logically correct.

What is the best way to handle semantic conflicts during a long-lived feature branch rebase?▼

Handling semantic conflicts during a feature branch rebase involves identifying the common ancestor and merging logic correctly. This approach applies safety guardrails to verify resolutions through build and test cycles, preventing broken commits.

Do I need specific git configuration to handle modify/delete and add/add conflicts?▼

Handling modify/delete and add/add conflicts requires git configuration for zdiff3 and rerere. These settings ensure accurate conflict resolution by providing better context markers and enabling repeatable conflict handling across rebases.

How does semantic conflict resolution work for rename/rename conflicts in version control?▼

Semantic conflict resolution for rename/rename conflicts works by analyzing the intent of both branches. Instead of simply deleting markers, it combines the underlying logic from each branch to produce semantically correct, functional code.

Why does my git rebase result in broken code even after manually resolving all conflict markers?▼

A git rebase results in broken code when resolutions only clear conflict markers without addressing semantic logic. Applying a structured workflow to verify resolutions through build and test cycles prevents broken code from being committed.

Related Skills

Explore More Software Engineering Skills→
raineraine
2.1k

rebase

Rebase current branch onto main or specified origin branches with conflict resolution.

Community
Basic
RafayelGardishyanRafayelGardishyan

test

Run Go unit tests and frontend Vitest suites via Make targets.

Community
Intermediate
icartshicartsh
4

git-advanced

Resolve merge conflicts and rewrite Git history with interactive rebasing.

Community
Advanced
FutureAtomsFutureAtoms
1

git-github-conflict-resolve

Guide Git merge conflict resolution with Git and gh commands.

Community
Intermediate