skills.rest
antinomyhq
antinomyhqOFFICIAL
Explore all skills by this author →
𝕏@forgecodehqGitHub

resolve-conflicts

Resolve Git merge conflicts through a plan-first approval workflow.

7.5k|1.4k|Updated Dec 8, 2024
Search Tags:#git#planning#validation#backup#conflict-resolution#merge-conflicts
One-click install
npx skills add https://github.com/antinomyhq/forge --skill resolve-conflicts-antinomyhq
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/antinomyhq/forge/tree/main/.forge/skills/resolve-conflicts
Command: npx skills add https://github.com/antinomyhq/forge --skill resolve-conflicts-antinomyhq

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git merge conflicts are error-prone and disrupt development workflows. This Skill provides a plan-first framework that guides users through conflict assessment, explicit resolution planning, user approval, and safe execution to preserve intent from both branches.

Core Features & Use Cases

  • Plan-First Resolution: Create a structured conflict resolution plan detailing conflict scope, strategies, risk, and action steps.
  • Backup, Regenerate, Validate: Back up affected files (including deleted-modified cases), regenerate generated artifacts when needed, and validate outcomes with tests.
  • Explain & Decide: Provide one-line explanations for each resolved conflict and present options when decisions are not obvious.

Quick Start

Begin by listing conflicted files, draft a plan, and obtain user approval before applying changes; then execute the plan and run validation.

Frequently Asked Questions about resolve-conflicts

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

FAQPage Schema
How do I resolve Git merge conflicts without losing the intent of both branches?▼

To resolve Git merge conflicts safely, use a plan-first framework that assesses the conflict scope, drafts a resolution strategy, secures user approval, and executes changes while preserving the intent of both branches.

What is the best way to handle merge conflicts in generated files and configuration?▼

The best way to handle merge conflicts in generated files and configuration is to back up affected files, regenerate the generated artifacts, and validate the outcomes with tests to ensure correctness.

Can I get a structured plan before applying changes to conflicted Git files?▼

Yes, you can create a structured conflict resolution plan detailing the conflict scope, resolution strategies, potential risks, and action steps, requiring your explicit approval before any changes are applied.

How do I validate code changes after fixing Git merge conflicts?▼

To validate code changes after fixing Git merge conflicts, execute the approved resolution plan and run validation tests to confirm that imports, tests, configuration, and code function correctly.

What should I do when a merge conflict involves deleted and modified files?▼

For merge conflicts involving deleted and modified files, back up the affected files first, then follow the plan-first framework to assess the conflict and decide on the correct resolution strategy.

Related Skills

Explore More Software Engineering Skills→
tailcallhqtailcallhq
7.5k

resolve-conflicts

Create a structured Git merge conflict resolution plan with backups and user approval.

Official
Advanced
MelvynxMelvynx
223

merge

Automate Git branch merges with context-aware conflict resolution.

Community
Advanced
meldoc-iomeldoc-io

collaboration

Coordinate team edits and reviews on Meldoc documentation.

Official
Intermediate
FutureAtomsFutureAtoms
1

git-github-conflict-resolve

Guide Git merge conflict resolution with Git and gh commands.

Community
Intermediate