1.6 KiB
name, description, risk, source, source_repo, source_type, date_added, license, license_source
| name | description | risk | source | source_repo | source_type | date_added | license | license_source |
|---|---|---|---|---|---|---|---|---|
| resolving-merge-conflicts | Use when you need to resolve an in-progress git merge/rebase conflict. | unknown | https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts | mattpocock/skills | community | 2026-07-01 | MIT | https://github.com/mattpocock/skills/blob/main/LICENSE |
When to Use
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.
Limitations
- Use this skill only when the task clearly matches its upstream source and local project context.
- Verify commands, generated code, dependencies, credentials, and external service behavior before applying changes.
- Do not treat examples as a substitute for environment-specific tests, security review, or user approval for destructive or costly actions.