resolve

Name: resolve
Availability: InStock
Author: sanskarbasnet

Resolve Git merge conflicts using recorded author intents and proposed unified diffs.

1|Updated May 4, 2026

Search Tags:#git #collaboration #merge #reasoning #diff #intent #conflicts

Ready to run

npx skills add https://github.com/sanskarbasnet/fstack --skill resolve-sanskarbasnet

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: resolve
Source: https://github.com/sanskarbasnet/fstack/tree/main/resolve
Command: npx skills add https://github.com/sanskarbasnet/fstack --skill resolve-sanskarbasnet

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve conflicts in Git by using recorded author intents to guide merges, reducing guesswork and risky changes.

Core Features & Use Cases

Reads both sides of a conflict and the associated intents from the brain.
Proposes a unified diff and a reasoning narrative, then asks for user confirmation before applying.
Suits collaborative coding with multiple contributors and noisy conflicts.

Quick Start

Trigger the resolve flow during a merge conflict and follow the prompts to review intents and apply the proposed resolution.

Frequently Asked Questions about resolve

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

FAQPage Schema

How do I resolve Git merge conflicts using author intents?▼

To resolve Git merge conflicts, this Skill reads both sides of a conflict and fetches associated author intents to reason about layering. It then proposes a unified diff with a resolution for user confirmation before applying any changes.

What is intent-aware merge resolution in code collaboration?▼

Intent-aware merge resolution is a process that pulls recorded author intents alongside current changes to guide conflict resolution. This reduces guesswork and risky changes by preserving the original goals across branches during merges.

How do I handle noisy conflicts with multiple contributors in Git?▼

You handle noisy conflicts by triggering the resolution flow during a Git merge conflict. The Skill evaluates both sides of the changes and their intents, generating a reasoning narrative and a proposed diff for you to review and apply.

Does Git merge resolution modify code without user confirmation?▼

No, Git merge resolution does not modify code without user confirmation. The Skill outputs a proposed unified diff and a reasoning narrative, then explicitly prompts the user to confirm before applying any changes to the conflicting branches.

When do I need intent-aware merge resolution for my repository?▼

You need intent-aware merge resolution for collaborative coding workflows with multiple contributors and noisy conflicts. It is applicable when conflicting branches require preserving author intent across merges to reduce risky changes.