skills.rest
shonenm
shonenmCOMMUNITY
Explore all skills by this author →
GitHub

conflict-resolve

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

2|Updated Dec 28, 2024
Search Tags:#git#developer tools#code review#merge#rebase#conflict resolution
One-click install
npx skills add https://github.com/shonenm/dotfiles --skill conflict-resolve-shonenm
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: conflict-resolve
Source: https://github.com/shonenm/dotfiles/tree/main/common/claude/.claude/skills/conflict-resolve
Command: npx skills add https://github.com/shonenm/dotfiles --skill conflict-resolve-shonenm

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill streamlines the often complex and error-prone process of resolving Git merge and rebase conflicts, ensuring code integrity and saving development time.

Core Features & Use Cases

  • Automated Conflict Detection: Identifies and analyzes merge/rebase conflicts.
  • 3-Way Diff Review: Prepares the state for detailed 3-way diff reviews.
  • Intelligent Resolution: Applies rules to resolve trivial conflicts (e.g., lock files, imports) and flags complex ones for manual review.
  • Use Case: When a Git rebase results in multiple conflicts across several files, this Skill can automatically resolve common issues like dependency lock file mismatches and import statement conflicts, then clearly mark the remaining complex conflicts for your focused attention.

Quick Start

Run /conflict-resolve to resolve current Git merge or rebase conflicts.

Frequently Asked Questions about conflict-resolve

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

FAQPage Schema
How do I resolve Git merge conflicts across multiple files?▼

To resolve Git merge conflicts across multiple files, this Skill analyzes base, ours, and theirs states, automatically resolving trivial conflicts like dependency lock files while flagging complex ones for manual 3-way diff review.

Can I automate Git rebase conflict resolution for lock files and imports?▼

Yes, you can automate Git rebase conflict resolution for lock files and imports by applying built-in intelligent rules that resolve these trivial conflicts automatically and record patterns using rerere for future automation.

What is the best way to prepare a repository for a 3-way diff review?▼

The best way to prepare a repository for a 3-way diff review is to analyze the base, ours, and theirs states, automatically resolving trivial conflicts to isolate only the complex conflicts requiring manual attention.

Does Git rerere work with automated merge conflict resolution tools?▼

Git rerere works with automated merge conflict resolution by recording your conflict resolution patterns, allowing the system to apply previously successful resolutions to identical conflicts encountered during future rebases or merges.

How do I know which Git conflicts need manual review versus automatic resolution?▼

To know which Git conflicts need manual review, the system applies automated resolution strategies to trivial conflicts like import statements and flags complex conflicts, clearly marking them for your focused manual attention.

Related Skills

Explore More Software Engineering Skills→
buvisbuvis
2

resolve-git-conflicts

Diagnose git conflict types and guide per-file resolution with abort options.

Official
Advanced
mixomatmixomat

clean-gone-branches

Delete local git branches marked [gone] while skipping worktree branches.

Community
Intermediate
robotijnrobotijn
3

coverage-enforcer

Parse cross-format coverage reports to enforce branch and diff thresholds and gate merges.

Community
Advanced
ryankoleanryankolean
3

cli-lazygit

Manage Git staging, commits, branching, and rebase workflows in a terminal UI.

Community
Advanced