[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7C8QRN7SWDD91GDX3VGJHFJ":3,"skill-same:01M7C8QRN7SWDD91GDX3VGJHFJ":53},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":16,"categories":17,"keywords":18,"publishedAt":19,"linkOnly":20,"markdownContent":21,"markdownBody":22,"frontMatter":23,"refName":24,"commitSha":25,"skillDirectory":26,"forksCount":27,"repositoryHtmlUrl":28,"repositoryHomepageUrl":6,"ownerHtmlUrl":29,"ownerBlogUrl":30,"ownerDescription":31,"updatedAt":32,"install":33,"resources":46},"01M7C8QRN7SWDD91GDX3VGJHFJ","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","transitive-bullshit\u002Fskills","transitive-bullshit","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F552829?v=4","01M7C8KS4F4572TZFKR12N2A3W","Travis Fischer","01M7C8KS56YA2KDQHDNXEGS23P",4,"MIT","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fprovenance\u002Fupstream\u002Fresolving-merge-conflicts\u002Fskill\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: resolving-merge-conflicts\ndescription: \"Use when you need to resolve an in-progress git merge\u002Frebase conflict.\"\n---\n\n1. **See the current state** of the merge\u002Frebase. 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\u002Ftickets.\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\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n","1. **See the current state** of the merge\u002Frebase. 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\u002Ftickets.\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\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n",{"name":5,"description":7},"main","fc9ff73613f4346442defd1318eae264af415d72","provenance\u002Fupstream\u002Fresolving-merge-conflicts\u002Fskill",1,"https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit","https:\u002F\u002Ftransitivebullsh.it","My heart is open source 💕 ","2026-10-24 01:38:48",{"source":8,"skillName":5,"commands":34,"prompt":44,"zipAvailable":45},[35,38,41],{"tool":36,"command":37},"npx","npx skills add transitive-bullshit\u002Fskills --skill resolving-merge-conflicts",{"tool":39,"command":40},"bunx","bunx skills add transitive-bullshit\u002Fskills --skill resolving-merge-conflicts",{"tool":42,"command":43},"pnpm","pnpm dlx skills add transitive-bullshit\u002Fskills --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fprovenance\u002Fupstream\u002Fresolving-merge-conflicts\u002Fskill\u002FSKILL.md",true,[47],{"path":48,"resourceType":49,"resourceTypeDesc":50,"sizeBytes":51,"sourceHtmlUrl":52},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fprovenance\u002Fupstream\u002Fresolving-merge-conflicts\u002Fskill\u002Fagents\u002Fopenai.yaml",[54,61,68,76,83,90],{"skillNo":55,"name":56,"nameZh":6,"description":57,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":58,"categories":59,"keywords":60,"publishedAt":19},"01M7C8Z0JQ0VH6YYSJQGXJKVV4","xurl","Paid X API fallback through xurl after cheaper X reads fail, or for authorized account actions unsupported by bird.","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fxurl\u002FSKILL.md",[],[],{"skillNo":62,"name":63,"nameZh":6,"description":64,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":65,"categories":66,"keywords":67,"publishedAt":19},"01M7C8YY74K2MJYK311R1PG31A","x-data","Read or research X\u002FTwitter posts, URLs, profiles, threads, or the user's X history using the cheapest available source.","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fx-data\u002FSKILL.md",[],[],{"skillNo":69,"name":70,"nameZh":6,"description":71,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":72,"sourceHtmlUrl":73,"categories":74,"keywords":75,"publishedAt":19},"01M7C8YV6AAFSCTS39C2MBKTTV","write-skills","Create or revise agent skills. Use when adding a new skill file, renaming a skill, simplifying an existing skill, improving trigger descriptions, or deciding what belongs in a skill versus references, scripts, assets, or ordinary docs.","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fwrite-skills\u002FLICENSE","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fwrite-skills\u002FSKILL.md",[],[],{"skillNo":77,"name":78,"nameZh":6,"description":79,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":80,"categories":81,"keywords":82,"publishedAt":19},"01M7C8YQFGTFVQQJCH8SPFS3YQ","web-perf","Audit, diagnose, or optimize website loading and interaction performance, Core Web Vitals, and Lighthouse performance scores.","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fweb-perf\u002FSKILL.md",[],[],{"skillNo":84,"name":85,"nameZh":6,"description":86,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":87,"categories":88,"keywords":89,"publishedAt":19},"01M7C8YJ6QFV6QFCJESHGZZ2B8","vercel-react-best-practices","Apply React and Next.js performance guidance. Use for performance work or a specific rendering, data-fetching, or bundle concern.","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fvercel-react-best-practices\u002FSKILL.md",[],[],{"skillNo":91,"name":92,"nameZh":6,"description":93,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":94,"categories":95,"keywords":96,"publishedAt":19},"01M7C8YBRVCMAZ99D1Y5QXHMG8","vercel-optimize","Audit deployed Vercel cost and performance using project metrics. Use for expensive or slow routes, usage analysis, and caching opportunities.","https:\u002F\u002Fgithub.com\u002Ftransitive-bullshit\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fvercel-optimize\u002FSKILL.md",[],[]]