Resolving Merge Conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
— No reviews yet
0 installs
19 views
0.0% view→install
Install
$ agentstack add skill-officialunofficial-skills-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.
Are you the author of Resolving Merge Conflicts? Claim this listing to set pricing, connect Stripe payouts, and keep 70% of every sale.
Sign up to claimAbout
- Read the current state of the merge or rebase. Inspect the git history and the files that conflict.
- Trace each conflict back to its source. Understand fully why each side made its change and what it was trying to achieve — read the commit messages, look at the PRs, follow the originating issues/tickets.
- Resolve every hunk. Keep both intents wherever they can coexist. Where they can't, take the side that matches the merge's stated goal and record the trade-off. Do not invent new behaviour. Always resolve; never
--abort.
- Find the project's automated checks and run them — usually typecheck first, then tests, then format. Repair whatever the merge broke.
- Complete the merge/rebase. Stage everything and commit. If you're rebasing, keep continuing until every commit is replayed.
Source & license
This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.
- Author: officialunofficial
- Source: officialunofficial/skills
- License: Apache-2.0
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.