brainstorming
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or planning anything new, in software or out of it (a talk, a business, a renovation).
Explore skills
Development · SKILL.md
resolving-merge-conflicts
resolving-merge-conflictsUse when you need to resolve an in-progress git merge/rebase conflict.
Independent GitHub snapshot · Automated classification · Original documentation governs
Skill documentation
GitHubname: 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.
CRITICAL: Preserve intent, never invent
Understand the original intent of each change before resolving it. Do not invent new behaviour; where intents conflict, pick the one matching the merge's stated goal and note the trade-off. 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.