skills.rest
ZanzyTHEbar
ZanzyTHEbarCOMMUNITY
Explore all skills by this author →
𝕏@ZacariahHeimGitHub

fix-merge-conflicts

Resolves git merge conflicts, validates builds and tests, and finalizes conflict resolution.

3|Updated Apr 8, 2025
Search Tags:#git#testing#merge conflicts#rebase#conflict resolution#build validation#lockfile
One-click install
npx skills add https://github.com/ZanzyTHEbar/dragonarchy --skill fix-merge-conflicts-zanzythebar
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-merge-conflicts
Source: https://github.com/ZanzyTHEbar/dragonarchy/tree/main/packages/opencode/.config/opencode/skills/fix-merge-conflicts
Command: npx skills add https://github.com/ZanzyTHEbar/dragonarchy --skill fix-merge-conflicts-zanzythebar

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Branches with unresolved merge or rebase conflicts block development, and manually resolving them risks leaving conflict markers, breaking the build, or losing important changes from either side. ## Core Features & Use Cases - Conflict Detection and Resolution: Detects all conflicting files from git status and conflict markers, then resolves each with minimal, correctness-first edits. - Build and Test Validation: Runs compile, lint, and relevant tests after resolution to confirm the merged state is buildable. - Safe Finalization: Regenerates lockfiles with package manager tools instead of hand-editing, and only stages resolved files when the user requests finalization. - Use Case: After rebasing a long-lived feature branch onto main produces conflicts across source files and a lockfile, use this Skill to resolve every conflict, regenerate the lockfile, and verify the project still compiles and passes tests. ## Quick Start Resolve all merge conflicts in my current branch and verify the build and tests pass.

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 git merge conflicts automatically?▼

Detect conflicting files from git status and conflict markers, then resolve each with minimal edits that preserve both sides when safe. Afterward, run compile, lint, and tests to confirm the merged state is buildable before staging anything.

How to fix merge conflicts in a lockfile?▼

Regenerate lockfiles with the package manager's own tools instead of hand-editing conflict markers. Manual edits to lockfiles often produce inconsistent dependency states, while regeneration guarantees a valid resolved dependency tree.

Does this work for rebase conflicts as well as merge conflicts?▼

Yes, the workflow applies to both merge and rebase conflicts since both leave conflict markers in files. The same detection, resolution, and validation steps apply regardless of which git operation produced the conflicts.

Will resolving conflicts automatically commit or push my changes?▼

No, files are only staged or marked resolved when you explicitly request finalization. The workflow never pushes or tags during conflict resolution, and otherwise summarizes resolved files and validation results.

What happens if both sides of a conflict cannot be preserved?▼

When both sides cannot be safely kept, the variant that compiles and keeps public behavior stable is chosen. Resolution choices are reported in the output so you can review any trade-offs made.

Related Skills

Explore More Software Engineering Skills→
compozycompozy
2.7k

git-rebase

Resolve git rebase conflicts while preserving features and maintaining linear commit history.

Official
Advanced
TyrizxTyrizx

update-pr

Updates an existing pull request with new commits and revised metadata.

Official
Intermediate
adityaarsharmaadityaarsharma
2

orbit-qa-regression-pack

Manage regression test suites with Playwright and CI pipelines.

Community
Advanced
dtsongdtsong
1

Git Rebase

Rebase the current Git branch onto a target branch with conflict resolution guidance.

Community
Intermediate