resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
DeepseekModel
Curated skill
★ Featured
Quality Excellent · 90
v1.0.0
Get
https://deepseekmodel.com/api/download.php?id=mattpocock-skills-skills-engineering-resolving-merge-conflicts-skill-md&format=skill
Download .skill
Standard format with system_prompt and model_config, ready for any agent framework
The actual content of the system_prompt field in the .skill file.
name resolving-merge-conflicts description Use when you need to resolve an in-progress git merge/rebase conflict. 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. Always resolve; never --abort . 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 everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Keywords that activate this skill. Click one to copy it.
This skill does not provide trigger words.
The downloaded .skill package contains the following fields.
| Field | Description |
|---|---|
| format | Format tag (skill/v1) |
| skill_id | Unique skill ID |
| name | Skill name |
| version | Version |
| description | Description |
| category | Categories (array) |
| trigger_words | Trigger words |
| tags | Tags |
| source | Source |
| source_url | Source URL (this page) |
| exported_at | Exported at (set per download) |
| system_prompt | System prompt body |
| model_config | Model config: provider / model / temperature / max_tokens / top_p |
| examples | Examples |
| install_guide | Import guide for Coze / Dify / Claude / custom frameworks |
The same skill can be exported in different platform formats.
