skills.rest
yulonglin
yulonglinCOMMUNITY
Explore all skills by this author →
Website𝕏@_yulonglinGitHub

fix-merge-conflict

Resolve Git merge conflicts non-interactively and verify builds and tests.

11|2|Updated May 29, 2025
Search Tags:#automation#git#build#code-quality#conflict-resolution#ci#merge-conflict
One-click install
npx skills add https://github.com/yulonglin/dotfiles --skill fix-merge-conflict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-merge-conflict
Source: https://github.com/yulonglin/dotfiles/tree/main/claude/local-marketplace/plugins/code-toolkit/skills/fix-merge-conflict
Command: npx skills add https://github.com/yulonglin/dotfiles --skill fix-merge-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Automatically resolve merge conflicts on the current Git branch non-interactively and ensure the repo builds and tests pass.

Core Features & Use Cases

  • Non-interactive conflict detection using git status and conflict-marker scanning
  • Per-file conflict resolution prioritizing buildable, test-passing results
  • Safe, deterministic merges that preserve public APIs and behavior
  • Use case: When integrating a feature branch into main, automatically resolve conflicts when possible and keep the codebase green.

Quick Start

From the repository root, run the tool to automatically fix current merge conflicts and verify the repository builds and tests pass.

Frequently Asked Questions about fix-merge-conflict

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

FAQPage Schema
How do I resolve git merge conflicts automatically without manual intervention?▼

Yes, resolving merge conflicts non-interactively ensures the repository builds and tests pass by applying deterministic, sensible defaults that prioritize buildable, test-passing results while preserving public APIs and behavior.

Can I automatically fix merge conflicts and ensure the repository builds and tests pass?▼

Automatically fixing both simple and complex merge conflicts works for standard integration scenarios like feature-branch merges and pull requests, handling conflict-marker scanning and per-file resolution deterministically.

Does the automated merge conflict resolution process push changes to the remote repository?▼

No, the automated merge conflict resolution process does not push or tag changes, but instead commits the resolved modifications locally to keep the codebase green without triggering remote repository updates.

What are the limitations of resolving git merge conflicts automatically?▼

A limitation of resolving git merge conflicts automatically is that it relies on non-interactive, sensible-default decisions, meaning it may require human intervention for conflicts that cannot be deterministically resolved while preserving APIs.

Related Skills

Explore More Software Engineering Skills→
LuminairPrimeLuminairPrime

pull

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

Community
Intermediate
TMI-appsTMI-apps
2

push

Validate and push committed Git changes to a remote repository.

Official
Intermediate
fredericpoitevinfredericpoitevin

babysit

Triage PR comments, resolve conflicts, and stabilize CI until merge-ready.

Community
Intermediate
eivindebeivindeb

manual-merge-branches

Merge Git branches with explicit user approval for each conflict resolution.

Community
Advanced