resolve-conflicts

Name: resolve-conflicts
Availability: InStock
Author: Tailcall

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

7.5k|1.4k|Updated Dec 8, 2024

Search Tags:#automation #git #planning #backups #resolution #merge-conflicts

Ready to run

npx skills add https://github.com/tailcallhq/forgecode --skill resolve-conflicts-tailcallhq

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/tailcallhq/forgecode/tree/main/.forge/skills/resolve-conflicts
Command: npx skills add https://github.com/tailcallhq/forgecode --skill resolve-conflicts-tailcallhq

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This skill provides a structured, plan-first framework for resolving Git merge conflicts by guiding users through assessment, planning, backup, and execution to preserve intent and minimize disruption.

Core Features & Use Cases

Plan-first conflict resolution: assess conflicts, generate a detailed resolution plan, and obtain user approval before applying changes.
Support for common conflict types: imports, tests, lock files, configuration files, and deleted-modified files with backup and analysis.
On-demand scaffolding and references: leverage stored scripts and reference plans to standardize merges across teams.

Quick Start

Provide a conflict resolution plan for the current merge and follow the guided steps to resolve conflicts safely.

Frequently Asked Questions about resolve-conflicts

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

FAQPage Schema

How do I safely resolve Git merge conflicts across multiple files?▼

To resolve Git merge conflicts safely, this tool guides you through a plan-first process that assesses conflicts, generates a detailed resolution plan, and requires your approval before applying any changes.

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

Handling Git merge conflicts in lock files and configuration requires a structured resolution plan with backups and analysis. This skill supports these common conflict types to preserve intent and minimize disruption.

How do I create a backup before resolving a deleted-modified Git merge conflict?▼

Creating a backup before resolving a deleted-modified Git merge conflict is built into this tool's execution phase, ensuring you can safely analyze and step through the resolution process.

Can I review a Git merge resolution plan before changes are applied?▼

Yes, you can review a Git merge resolution plan before changes are applied. The tool enforces user approval at each step, generating a final validation plan to ensure the merge is correct.

How do I resolve import and test conflicts during a Git merge?▼

To resolve import and test conflicts during a Git merge, the tool applies a structured step-by-step action plan with on-demand scaffolding and references to standardize the merge safely.

Why do I need a structured plan for Git merge conflict resolution?▼

A structured plan for Git merge conflict resolution prevents accidental data loss by enforcing user approval, creating backups, and validating the final merge state to preserve original intent.