{"id":20338,"plugin_id":"plugins_6aa30969a11081918744c9ca04e16d35","kind":"skill","collection_source":null,"comparison_source":null,"observed_at":"2026-09-30T23:16:12.334Z","digest":"c48de6fd5d7d35430deb30fc5910af5936b8bfe82b9e866617166499794ba415","against":null,"payload":{"name":"resolving-merge-conflicts","description":"Use when you need to resolve an in-progress git merge/rebase conflict.","included_files":[{"relative_path":"agents/openai.yaml","size_in_bytes":113}],"skill_md_contents":"---\nname: resolving-merge-conflicts\ndescription: \"Use when you need to resolve an in-progress git merge/rebase conflict.\"\ndisable-model-invocation: true\n---\n\n1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.\n\n2. **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.\n\n3. **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`.\n\n4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.\n\n5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n"},"changes":[],"summary":"First saved snapshot. No earlier version is available for comparison.","summary_kind":"deterministic","summary_metadata":{}}