Resolve Git merge conflicts using recorded author intents and proposed unified diffs.
npx skills add https://github.com/sanskarbasnet/fstack --skill resolve-sanskarbasnet
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
Resolve conflicts in Git by using recorded author intents to guide merges, reducing guesswork and risky changes.
Trigger the resolve flow during a merge conflict and follow the prompts to review intents and apply the proposed resolution.
High-intent search queries and answers about installing and using this skill.
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.
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.
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.
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.
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.
EpiphyticRebase Git branches onto remote targets with structured conflict resolution guidance.
berrzebbSquash-merge a git worktree into the target branch with a structured commit message.
dmzoneillRebase the current Git branch onto main with stashing and optional force push.
JunjieChen0Analyze git history and commit messages to resolve merge conflicts.
