Drin Git Rebase Conflict Solver
Systematic workflow for solving complex merge and rebase conflicts without losing work.
Install
$ agentstack add skill-pedrol-cmd-brain-drin-drin-git-rebase-conflict-solver ✓ scanned · ✓ verified — works with Claude Code, Cursor, and more.
Security review
✓ PassedNo issues found. Passed automated security review. · v0.1.0 How review works →
- ✓ Prompt-injection patterns
- ✓ Secret / credential exfiltration
- ✓ Dangerous shell & filesystem operations
- ✓ Untrusted network calls
- ✓ Known-malicious package signatures
What it can access
- ✓ Network access No
- ✓ Filesystem access No
- ✓ Shell / process execution No
- ✓ Environment & secrets No
- ✓ Dynamic code execution No
From automated source analysis of v0.1.0. “Used” means the capability is present in the source — more access means more to trust, not that it’s unsafe.
About
Git Rebase Conflict Solver
Purpose
To maintain a clean git history while ensuring code integrity during complex merges.
Workflow
- Abort/Backup: If lost,
git rebase --abort. Create a backup branch. - Rebase:
git rebase [target]. - Conflict Identification: Open files with
<<<<<<<markers. - Resolution: Apply logic to merge both changes correctly.
- Continue:
git add .andgit rebase --continue.
Rules
- Never use
-f(force) on shared branches without team sync. - Verify the build/tests after every conflict resolution step.
Source & license
This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.
- Author: pedrol-cmd
- Source: pedrol-cmd/brain-drin
- License: MIT
Install and usage instructions live in the source repository linked above.
Reviews
No reviews yet — be the first.
Write a review
Versions
- v0.1.0 Imported from the upstream source.