{"id":20069,"plugin_id":"plugins_6aa191da1fc481918b1b2cdf6adf2f7b","kind":"skill","collection_source":null,"comparison_source":null,"observed_at":"2026-09-30T23:16:00.395Z","digest":"c1d25a8e99fd9a572f2a07bbd78c4e2179d0a8429e303fdca57b7c5f420540b8","against":null,"payload":{"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}],"name":"resolving-merge-conflicts","skill_md_contents":"---\nname: resolving-merge-conflicts\ndescription: \"Use when you need to resolve an in-progress git merge/rebase conflict.\"\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":{}}