skills.rest
kriscendobot
kriscendobotCOMMUNITY
Explore all skills by this author →
GitHub

conflict-resolution

Resolve git merge and rebase conflicts by analyzing semantic intent of both branches.

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill eliminates the risk of mechanical or accidental code loss during git merges and rebases by enforcing a manual, intent-aware review of conflicting code hunks.

Core Features & Use Cases

  • Semantic Resolution: Ensures code is merged based on developer intent rather than blindly accepting one side or the other.
  • Safety Checks: Validates resolutions by running tests and checking for regressions in affected packages.
  • Use Case: When a rebase fails due to overlapping changes in a shared utility function, this skill guides the agent to read both commit histories and weave the logic together correctly.

Quick Start

Invoke the conflict resolution skill to analyze and merge the current set of conflicted files in the repository.

Frequently Asked Questions about conflict-resolution

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

FAQPage Schema
How do I resolve git merge conflicts based on code intent rather than just accepting one side?▼

Resolving git merge conflicts based on intent requires analyzing the semantic purpose of both branches. Instead of mechanically picking sides, read the commit histories and file diffs to weave the overlapping logic together while maintaining logical consistency.

What is the best way to fix a failed git rebase with overlapping changes in a shared utility function?▼

Fixing a failed git rebase with overlapping changes involves analyzing the conflicted files identified by git status. You must review the file diffs and git log to understand both conflicting intents, then manually combine the logic to prevent regression.

Can I verify the integrity of my git conflict resolution before finalizing the merge?▼

Yes, you can verify the integrity of your git conflict resolution by executing local tests. Running test environments on the affected packages validates the final resolution and checks for regressions caused by the semantic merge.

How do I identify which files need manual conflict resolution during a git rebase?▼

You can identify which files need manual conflict resolution during a git rebase by running git status. This command explicitly lists the conflicted files in your repository, allowing you to target only the overlapping code hunks.

Related Skills

Explore More Software Engineering Skills→
xxihxxih
1

merge-conflict-resolution

Resolve git merge conflicts by identifying types, applying per-file strategies, and validating the final state.

Community
Advanced
WesleyMFrederickWesleyMFrederick

merging-feature-branches-to-main

Squashes Git feature-branch history into a single commit when merging to main.

Community
Basic
cschmatzlercschmatzler

jujutsu

Automate version control workflows with Jujutsu for change management and Git interop.

Community
Intermediate
alexandersumeralexandersumer
1

resolve-conflict

Guide resolution of merge conflicts while preserving branch intent.

Community
Intermediate