git-rebase-resolution
CommunityResolve rebase conflicts with intent.
AuthorJitsusama
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill helps agents resolve Git rebase conflicts by preserving the original design intent of both the feature branch and the target branch, preventing accidental loss of functionality or architectural integrity.
Core Features & Use Cases
- Conflict Analysis: Guides the agent to understand the underlying problems and solutions of conflicting changes.
- Intent Preservation: Prioritizes architectural soundness and feature completeness over simple code merging.
- Verification Steps: Ensures that all tests pass and functionality remains intact after resolution.
- Safe Pushing: Enforces the use of
--force-with-leaseand requires user confirmation before pushing. - Use Case: When a Git rebase results in merge conflicts, this skill assists the agent in making informed decisions about how to integrate the changes, ensuring that neither the new features nor the existing architecture are compromised.
Quick Start
Use the git-rebase-resolution skill to help resolve the current rebase conflicts.
Dependency Matrix
Required Modules
None requiredComponents
Standard package💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: git-rebase-resolution Download link: https://github.com/Jitsusama/agentic-harness.pi/archive/main.zip#git-rebase-resolution Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.