SkillCurrent
Resolving merge conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
0
Save adds this to your Playground favorites. Hearts show appreciation.
Set it up
Pick the app you use.
resolving-merge-conflicts
- 1
Open Plugins → Skills
Left sidebar → Plugins, then the Skills tab.
- 2
Add → Upload from your computer
Pick the SKILL.md (or Create with editor and paste the text), then Create.
- 3
Use it with /
In a chat, type / and pick the skill, then write your request.
Show the skill file
Codemd
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files. 2. **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. 3. **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. Always resolve; never `--abort`. 4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke. 5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Read a skill before you install it: it tells the AI what to do. Promptu never installs or runs anything.
Install from the command line
Install
npx skills add https://github.com/mattpocock/skills
Review commands before running them. Promptu never runs code on your machine or pushes changes to your repo.

