skills.rest
MiDouTech
MiDouTechOFFICIAL
Explore all skills by this author →
GitHub

conflict-resolution

Merge main into a feature branch and classify conflicts for resolution.

Updated Mar 30, 2026
Search Tags:#automation#git#safety#merge#conflict-resolution#pull-request
One-click install
npx skills add https://github.com/MiDouTech/myTapd --skill conflict-resolution-midoutech
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: conflict-resolution
Source: https://github.com/MiDouTech/myTapd/tree/main/.claude/skills/conflict-resolution
Command: npx skills add https://github.com/MiDouTech/myTapd --skill conflict-resolution-midoutech

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill reduces the time and risk of resolving merge conflicts by pre-merging the repository's main branch into a developer's feature branch and handling trivial conflicts automatically while surfacing risky decisions for human review. It prevents surprise conflicts at PR time, enforces workspace safety checks, and keeps a rollback anchor to recover from mistakes.

Core Features & Use Cases

  • Manual-trigger guardrails that require explicit user intent before any merge action, ensuring AI never auto-invokes merges.
  • Phased workflow: workspace validation, fetch origin/main, merge attempt, conflict scanning and classification into Level 1/2/3, conservative automated resolutions for safe cases, interactive prompts for human confirmation, compilation/type/test verification, commit and push, and rollback support.
  • Use case: a developer preparing a pull request runs the skill to pre-merge main, automatically resolve import/formatting or non-overlapping additions, and receive a structured report and prompts for any risky or ambiguous conflicts.

Quick Start

Say "/resolve" when on a clean feature branch to run an AI-assisted pre-merge of origin/main that attempts safe auto-resolutions, classifies conflicts, asks for confirmations on risky changes, runs verification checks, and records a rollback anchor.

Frequently Asked Questions about conflict-resolution

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

FAQPage Schema
How do I pre-merge main into a feature branch to resolve git conflicts before a pull request?▼

To pre-merge main into a feature branch, run an automated merge of origin/main to detect conflicts, auto-resolve trivial cases like formatting, and interactively prompt for risky changes before running build checks. This prevents surprise conflicts at PR time.

What is the safest way to automate git merge conflict resolution for a pull request?▼

The safest way to automate git merge conflict resolution requires explicit manual triggering, performs workspace safety checks, classifies conflicts into risk levels, and records a rollback anchor to recover from mistakes before committing.

Can I automatically resolve trivial git merge conflicts while keeping risky changes interactive?▼

Yes, you can automatically resolve trivial git merge conflicts while keeping risky changes interactive by classifying conflicts into levels, auto-resolving safe blocks like non-overlapping additions, and prompting for human confirmation on ambiguous changes.

Does automated conflict resolution run build and type checks after merging main?▼

Yes, automated conflict resolution runs build, type, and test verification checks after merging main into your feature branch. This ensures the merged code compiles correctly before committing and pushing the changes.

What should I do if a git merge conflict resolution fails or breaks my workspace?▼

If a git merge conflict resolution fails or breaks your workspace, use the recorded rollback anchor to revert the merge attempt. The workflow enforces safety checks and manual-trigger guardrails to prevent unauthorized automated merges.

Related Skills

Explore More Software Engineering Skills→
ZESCODEZESCODE

ZES-using-git-worktrees

Automate creation and management of isolated git worktrees for feature development.

Community
Advanced
MilesChouMilesChou
1

Resolving-Conflict

Resolve Git conflicts during rebase or merge operations.

Community
Basic
billydeeii136billydeeii136

health

Compute a weighted 0-10 codebase health score and track trends over time.

Community
Intermediate
AutumnsGroveAutumnsGrove
26

git-advanced

Guide interactive rebasing, conflict resolution, and branch strategies for Git workflows.

Community
Basic