Resolving Merge Conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Install
$ agentstack add skill-waffleflopper-ai-tools-resolving-merge-conflicts ✓ 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.
Verified badge
Passed review? Show it. Paste this badge into your README, it links to the public security report.
Links to your public security report.[](https://agentstack.voostack.com/security/report/skill-waffleflopper-ai-tools-resolving-merge-conflicts) Reliability & compatibility
Declared compatibility
Compatibility is declared by the source manifest. End-to-end runtime verification is coming, see below.
We're building live execution health for every listing: tool-call success rate, median latency, uptime, and last-checked timestamps, measured, not self-reported. It isn't live yet, so we don't show numbers we can't stand behind.
How agent discovery & health will work →About
- See the current state of the merge/rebase. Check git history, and the conflicting files.
- Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
- Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Follow an explicit user request to abort. If incompatible intents leave a consequential product choice unresolved, explain that choice and ask rather than inventing behavior.
- Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
- Finish the merge/rebase. Stage resolved task-owned files and retain the intended changes already staged by the merge or rebase. Preserve unrelated working-tree and staged changes. Verify the staged diff contains only the intended merge or rebase changes before committing; if unrelated staged changes would enter the commit, preserve them outside that commit or ask when safe separation is unclear. If rebasing, continue the rebase process until all commits are rebased.
Source & license
This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.
- Author: waffleflopper
- Source: waffleflopper/ai-tools
- 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.