Classify and resolve merge conflicts across parallel worktrees.
npx skills add https://github.com/tgsatwit/agent-delivery-pub --skill merge-resolve
Please help me install this Agent Skill. Skill: merge-resolve Source: https://github.com/tgsatwit/agent-delivery-pub/tree/main/.claude/skills/merge-resolve Command: npx skills add https://github.com/tgsatwit/agent-delivery-pub --skill merge-resolve
This Skill streamlines the process of resolving merge conflicts that arise from parallel development, reducing friction and saving developer time.
Use the merge-resolve skill to analyze and resolve conflicts in the current repository.
High-intent search queries and answers about installing and using this skill.
To resolve merge conflicts from parallel development, this Skill classifies conflict types and applies deterministic strategies. It automatically fixes formatting and additive conflicts based on build standards while flagging complex logic and structural disagreements for manual review.
Handling logic and structural merge conflicts requires contextual analysis. This Skill evaluates structural conflicts against architectural decisions and presents logic conflicts with detailed implementation context, providing recommendations to ensure design integrity during resolution.
Yes, you can auto-resolve formatting and additive git conflicts. The Skill identifies these safe conflict categories and applies deterministic resolution strategies based on defined build standards to combine non-conflicting additions and fix style inconsistencies automatically.
Yes, this merge conflict resolution tool works directly on parallel worktrees. It analyzes conflicts produced by parallel implementation branches, categorizing them into formatting, additive, logic, structural, and rename types to minimize manual intervention.
Classifying merge conflicts before resolving them ensures safe conflicts are automated and complex ones receive human oversight. Categorizing into formatting, additive, logic, structural, and rename types allows deterministic strategies to apply build standards while protecting design integrity.
You should not use automated merge conflict resolution for logic or structural disagreements. The Skill intentionally avoids auto-resolving these complex categories, instead presenting them with implementation context and architectural analysis for manual human decision-making.
jonniiManage stacked Git branches and submit associated pull requests to GitHub.
HomericIntelligenceExecute Mojo or Python test suites and generate validation reports.
mattsp1290Automate code review, security verification, and merge readiness checks for software projects.
safzanpiraniResolve git merge conflicts and validate builds and tests.
