mirror of
https://github.com/mattpocock/skills.git
synced 2026-09-12 10:28:06 +07:00
Remote Box AgentandClaude Sonnet 5
321658273c
Every em-dash across docs, skill files, scripts, and JSON/YAML metadata was rewritten by hand (commas, colons, periods, parentheses, conjunctions) rather than mechanically substituted, so sentences still read naturally. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
15 lines
918 B
Markdown
15 lines
918 B
Markdown
---
|
|
name: resolving-merge-conflicts
|
|
description: "Use when you need to resolve an in-progress git merge/rebase conflict."
|
|
---
|
|
|
|
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.
|