·merge-conflict-resolver

merge-conflict-resolver

Name: merge-conflict-resolver
Author: auldsyababua

✓

auldsyababua/instructor-workflowGitHub: auldsyababua/instructor-workflow Source: auldsyababua/instructor-workflow

Analyze branch divergence, detect potential conflicts, and guide merge resolution for any Git repository. Auto-detects current branch or accepts parameters.

auldsyababua·merge·conflict·resolver

3Installs·0Trend·@auldsyababua

Installation

GitHub: auldsyababua/instructor-workflow

$npx skills add https://github.com/auldsyababua/instructor-workflow --skill merge-conflict-resolver

How to Install merge-conflict-resolver

Quickly install merge-conflict-resolver AI skill to your development environment via command line

Open Terminal: Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.)
Run Installation Command: Copy and run this command: npx skills add https://github.com/auldsyababua/instructor-workflow --skill merge-conflict-resolver
Verify Installation: Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw

Source: auldsyababua/instructor-workflow.

SKILL.md

View raw

A comprehensive skill for analyzing Git branch divergence, detecting potential merge conflicts before they occur, and guiding users through systematic conflict resolution. This skill provides both automated analysis and manual resolution workflows.

Remember: Merge conflict resolution requires human judgment. These scripts analyze and guide, but you make the final decisions about which changes to keep.

Analyze branch divergence, detect potential conflicts, and guide merge resolution for any Git repository. Auto-detects current branch or accepts parameters. Source: auldsyababua/instructor-workflow.

Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.) Copy and run this command: npx skills add https://github.com/auldsyababua/instructor-workflow --skill merge-conflict-resolver Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw

Facts (cite-ready)

Stable fields and commands for AI/search citations.

Install command: npx skills add https://github.com/auldsyababua/instructor-workflow --skill merge-conflict-resolver
Source: auldsyababua/instructor-workflow
Category: >_Productivity
Verified: ✓
First Seen: 2026-02-25
Updated: 2026-03-10
URL: https://www.learn-skills.dev/en/skills/auldsyababua/instructor-workflow/merge-conflict-resolver

Browse more skills from auldsyababua/instructor-workflow

Quick answers

What is merge-conflict-resolver?

Analyze branch divergence, detect potential conflicts, and guide merge resolution for any Git repository. Auto-detects current branch or accepts parameters. Source: auldsyababua/instructor-workflow.