skills.rest
girijashankarj
girijashankarjCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-conflict-resolver

Classify and resolve git merge conflicts with guided validation steps.

28|3|Updated Mar 7, 2026
Search Tags:#git#rebase#conflict-resolution#version-control#merge-conflicts#conflict-markers
One-click install
npx skills add https://github.com/girijashankarj/cursor-handbook --skill git-conflict-resolver
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-conflict-resolver
Source: https://github.com/girijashankarj/cursor-handbook/tree/main/.cursor/skills/devops/git-conflict-resolver
Command: npx skills add https://github.com/girijashankarj/cursor-handbook --skill git-conflict-resolver

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Safely resolve git merge conflicts by understanding both sides, choosing the correct resolution, and validating the result.

Core Features & Use Cases

  • Classify conflicts by type (trivial, additive, competing, structural, delete-vs-edit, semantic) and apply the appropriate resolution strategy.
  • Step-by-step workflow to assess, understand, resolve, validate, and finalize merges or rebases with guardrails.
  • Use cases include resolving in-progress merges, rebases, and cherry-picks with minimal disruption and clear auditing.

Quick Start

Guide me through resolving the current merge conflict step by step.

Frequently Asked Questions about git-conflict-resolver

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

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

Git merge conflicts can be classified as trivial, additive, competing, structural, delete-vs-edit, or semantic. Each conflict type requires a different resolution strategy to safely reconcile divergent branch histories during version control operations.

What is the best way to handle conflicting changes during a git rebase?▼

After resolving git merge conflicts, you should validate the result by checking git status, running tests, and verifying a clean working tree. This post-resolution validation ensures the final merge or rebase maintains repository integrity and prevents broken commits.

Can I get guided help resolving delete-vs-edit conflicts in version control?▼

Yes, you can resolve delete-vs-edit conflicts by classifying them and applying the appropriate resolution strategy. A guided workflow helps you understand whether to keep the edits or accept the deletion, ensuring the final version control state matches the intended codebase structure.

Why do I need to validate my working tree after resolving merge conflicts?▼

You need to validate your working tree after resolving merge conflicts to ensure the merged changes do not break existing functionality. Checking git status, running tests, and confirming a clean tree provides guardrails against introducing errors during rebases or cherry-picks.

Related Skills

Explore More Software Engineering Skills→
LuminairPrimeLuminairPrime

pull

Synchronize a local branch with origin/main and resolve merge conflicts.

Community
Intermediate
bryonjacobbryonjacob

installing-git-hooks

Install git hooks to run format, lint, typecheck, and tests via justfile commands.

Community
Advanced
OpenAuthorityOpenAuthority
8

git_diff

Generate unified Git diffs for commits, unstaged changes, or specific paths.

Official
Intermediate
shonenmshonenm
2

conflict-resolve

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

Community
Advanced