skills.rest
JaimeJunr
JaimeJunrCOMMUNITY
Explore all skills by this author →
GitHub

fix-merge-conflicts

Resolve merge conflicts and verify builds and tests.

2|Updated Apr 11, 2026
Search Tags:#git#devops#codebase#build#conflict-resolution#merge-conflicts#tests
One-click install
npx skills add https://github.com/JaimeJunr/context-mode --skill fix-merge-conflicts-jaimejunr
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-merge-conflicts
Source: https://github.com/JaimeJunr/context-mode/tree/main/.claude/skills/fix-merge-conflicts
Command: npx skills add https://github.com/JaimeJunr/context-mode --skill fix-merge-conflicts-jaimejunr

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve merge conflicts non-interactively, validate builds and tests, and finalize conflict resolution.

Core Features & Use Cases

  • Detects conflicting files and markers from git status
  • Applies deterministic resolutions that preserve public API and behavior
  • Validates by rebuilding and running tests, regenerating lockfiles as needed
  • Use case: when a branch merges with conflicting changes across multiple files and deep dependency trees

Quick Start

Resolve all merge conflicts in the working tree and produce a build-ready, tested state.

Frequently Asked Questions about fix-merge-conflicts

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

FAQPage Schema
How do I resolve merge conflicts non-interactively in a multi-developer project?▼

To resolve merge conflicts non-interactively, the Skill detects conflicting files and markers from git status and applies deterministic resolutions that preserve public API and behavior to produce a build-ready codebase.

Can I automatically fix git conflicts during a rebase or pull request?▼

Yes, you can automatically fix git conflicts during merges, rebases, and pull requests by applying deterministic resolutions that preserve the public API and behavior across conflicting changes.

What is the best way to ensure a codebase is build-ready after resolving merge conflicts?▼

The best way to ensure a codebase is build-ready after resolving merge conflicts is to validate by rebuilding the project and running tests, regenerating lockfiles as needed to finalize the resolution.

Does this merge conflict resolution approach work with deep dependency trees and lockfile regeneration?▼

Yes, this approach works with deep dependency trees by detecting conflicting files from git status and regenerating lockfiles as needed during the build verification and test execution phases.

Why should I use deterministic conflict resolution instead of manual merging?▼

You should use deterministic conflict resolution to automatically apply changes that preserve public API and behavior, ensuring consistent results while validating builds and running tests to finalize the resolution.

Related Skills

Explore More Software Engineering Skills→
berkcangumusisikberkcangumusisik
11

merge-conflict

Identify and resolve merge conflict markers across multi-language codebases.

Community
Intermediate
xkazm04xkazm04

build-review

Run build and test pipelines and fix detected failures in monorepos.

Community
Advanced
ProyectoG007ProyectoG007

Git

Manage Git commits, branches, rebases, merges, and conflict resolution.

Community
Advanced
tyler-dot-earthtyler-dot-earth
1

staging-git-hunks

List and stage git hunks by ID without interactive input.

Community
Intermediate