[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M76SN805RM1JZGA219C9EBP2":3,"skill-same:01M76SN805RM1JZGA219C9EBP2":59},{"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":27,"commitSha":28,"skillDirectory":29,"forksCount":30,"repositoryHtmlUrl":31,"repositoryHomepageUrl":6,"ownerHtmlUrl":32,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":33,"install":34,"resources":46},"01M76SN805RM1JZGA219C9EBP2","merge",null,"Intelligently merge branches with context-aware conflict resolution","zuzu59\u002Fz-skills","zuzu59","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F15345233?v=4","01M756RFXRYFCM8DCAHTP0F5YW","Christian Zufferey","01M756RFYZRYH7F070CKQRMW38",0,"MIT","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmerge\u002FSKILL.md",[],[],"2026-11-12 13:55:43",false,"---\nname: merge\ndescription: Intelligently merge branches with context-aware conflict resolution\nallowed-tools: Bash(git :*), Bash(gh :*), Read, Edit, MultiEdit, Task\nargument-hint: \u003Cbranch-name>\ndisable-model-invocation: true\nallow_implicit_invocation: false\n---\n\n# Merge\n\nMerge branches intelligently by understanding feature context and resolving conflicts efficiently.\n\n## Context\n\n- Current branch: !`git branch --show-current`\n- Working tree status: !`git status --short`\n- Target branch: $1\n- Recent commits: !`git log --oneline -5`\n\n## Workflow\n\n1. **CONTEXT GATHERING**:\n   - `git branch --show-current` to identify current branch\n   - `git status` to ensure clean working tree\n   - **CRITICAL**: Abort if uncommitted changes exist\n\n2. **FEATURE ANALYSIS**:\n   - Search PR with `gh pr list --head \u003Cbranch-name>`\n   - Get PR details with `gh pr view \u003Cnumber> --json title,body,files`\n   - Use Task agents to gather context from PR\u002Fissue descriptions\n\n3. **MERGE ATTEMPT**:\n   - `git fetch origin \u003Cbranch-name>`\n   - `git merge origin\u002F\u003Cbranch-name> --no-commit`\n   - Check status with `git status --porcelain`\n\n4. **CONFLICT DETECTION**:\n   - Clean merge: `git commit` with descriptive message\n   - Conflicts: Parse `git diff --name-only --diff-filter=U`\n\n5. **SMART RESOLUTION**: For each conflicted file:\n   - Read file to understand conflict markers\n   - Apply resolution based on context:\n     - **Feature additions**: Keep both if non-overlapping\n     - **Bug fixes**: Prefer incoming if fixing known issue\n     - **Refactors**: Analyze intent and merge carefully\n   - Use MultiEdit to resolve all conflicts\n   - **STOP**: If >10 files conflicted, ask user\n\n6. **VERIFICATION**:\n   - `git diff --cached` to review changes\n   - Check no conflict markers remain: `grep -r \"\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD\"`\n   - `git add -A` and commit\n\n## Conflict Resolution by Type\n\n- **package.json**: Merge dependencies, prefer higher versions\n- **Config files**: Combine settings unless mutually exclusive\n- **Source code**: Use PR\u002Fissue context to understand intent\n- **Tests**: Keep all tests unless duplicates\n- **Imports**: Merge all, deduplicate\n\n## Rules\n\n- ALWAYS gather context before merging\n- NEVER blindly accept theirs\u002Fours without analysis\n- ABORT if conflicts exceed 10 files\n- Max 3 resolution attempts per file\n- If stuck: `git merge --abort` and report blockers\n","# Merge\n\nMerge branches intelligently by understanding feature context and resolving conflicts efficiently.\n\n## Context\n\n- Current branch: !`git branch --show-current`\n- Working tree status: !`git status --short`\n- Target branch: $1\n- Recent commits: !`git log --oneline -5`\n\n## Workflow\n\n1. **CONTEXT GATHERING**:\n   - `git branch --show-current` to identify current branch\n   - `git status` to ensure clean working tree\n   - **CRITICAL**: Abort if uncommitted changes exist\n\n2. **FEATURE ANALYSIS**:\n   - Search PR with `gh pr list --head \u003Cbranch-name>`\n   - Get PR details with `gh pr view \u003Cnumber> --json title,body,files`\n   - Use Task agents to gather context from PR\u002Fissue descriptions\n\n3. **MERGE ATTEMPT**:\n   - `git fetch origin \u003Cbranch-name>`\n   - `git merge origin\u002F\u003Cbranch-name> --no-commit`\n   - Check status with `git status --porcelain`\n\n4. **CONFLICT DETECTION**:\n   - Clean merge: `git commit` with descriptive message\n   - Conflicts: Parse `git diff --name-only --diff-filter=U`\n\n5. **SMART RESOLUTION**: For each conflicted file:\n   - Read file to understand conflict markers\n   - Apply resolution based on context:\n     - **Feature additions**: Keep both if non-overlapping\n     - **Bug fixes**: Prefer incoming if fixing known issue\n     - **Refactors**: Analyze intent and merge carefully\n   - Use MultiEdit to resolve all conflicts\n   - **STOP**: If >10 files conflicted, ask user\n\n6. **VERIFICATION**:\n   - `git diff --cached` to review changes\n   - Check no conflict markers remain: `grep -r \"\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD\"`\n   - `git add -A` and commit\n\n## Conflict Resolution by Type\n\n- **package.json**: Merge dependencies, prefer higher versions\n- **Config files**: Combine settings unless mutually exclusive\n- **Source code**: Use PR\u002Fissue context to understand intent\n- **Tests**: Keep all tests unless duplicates\n- **Imports**: Merge all, deduplicate\n\n## Rules\n\n- ALWAYS gather context before merging\n- NEVER blindly accept theirs\u002Fours without analysis\n- ABORT if conflicts exceed 10 files\n- Max 3 resolution attempts per file\n- If stuck: `git merge --abort` and report blockers\n",{"name":5,"description":7,"allowed-tools":24,"argument-hint":25,"disable-model-invocation":26,"allow_implicit_invocation":20},"Bash(git :*), Bash(gh :*), Read, Edit, MultiEdit, Task","\u003Cbranch-name>",true,"master","46a82833a3f7f6f5f408511246a55e0485c5f7ab","skills\u002Fmerge",1,"https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills","https:\u002F\u002Fgithub.com\u002Fzuzu59","2026-09-30 17:58:42",{"source":8,"skillName":5,"commands":35,"prompt":45,"zipAvailable":26},[36,39,42],{"tool":37,"command":38},"npx","npx skills add zuzu59\u002Fz-skills --skill merge",{"tool":40,"command":41},"bunx","bunx skills add zuzu59\u002Fz-skills --skill merge",{"tool":43,"command":44},"pnpm","pnpm dlx skills add zuzu59\u002Fz-skills --skill merge","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmerge\u002FSKILL.md",[47,53],{"path":48,"resourceType":49,"resourceTypeDesc":50,"sizeBytes":51,"sourceHtmlUrl":52},"agents\u002Fopenai.yaml","REFERENCE","参考文档",322,"https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmerge\u002Fagents\u002Fopenai.yaml",{"path":54,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":57,"sourceHtmlUrl":58},"assets\u002Fcodex-icon.svg","ASSET","资产文件",431,"https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fmerge\u002Fassets\u002Fcodex-icon.svg",[60,67,74,81,88,95],{"skillNo":61,"name":62,"nameZh":6,"description":63,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":64,"categories":65,"keywords":66,"publishedAt":19},"01M76SQGVSKRYNQX4AA4RXV3K0","writing-great-skills","Reference for writing and editing skills well — the vocabulary and principles that make a skill predictable.","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fwriting-great-skills\u002FSKILL.md",[],[],{"skillNo":68,"name":69,"nameZh":6,"description":70,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":73,"publishedAt":19},"01M76SQDSAZSA1272D56JY8Q2G","use-style","Apply named visual style guides to landing pages, app shells, and UI. Use for $use-style, \u002Fuseskill, list styles, or styles like ios-app, grid, vercel, black-grid, stripe, linear, raycast, gumroad, dusk, or luma.","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fuse-style\u002FSKILL.md",[],[],{"skillNo":75,"name":76,"nameZh":6,"description":77,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":78,"categories":79,"keywords":80,"publishedAt":19},"01M76SQAXDVX02V4JH4PF1MC9G","use-goal","Use when the user asks to create, draft, set, start, or refine a Codex or Claude Code `\u002Fgoal` objective for persistent multi-turn work.","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fuse-goal\u002FSKILL.md",[],[],{"skillNo":82,"name":83,"nameZh":6,"description":84,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":85,"categories":86,"keywords":87,"publishedAt":19},"01M76SQ8B11GTTGQ5CZHHGXFXM","use-fable","Orchestrator mode for Fable: Fable thinks, plans, and reviews while Codex CLI and subagents execute all heavy work. Use when the user invokes \u002Fuse-fable, says 'use fable', 'fable mode', 'orchestrator mode', or wants to save Fable tokens\u002Frate limits.","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fuse-fable\u002FSKILL.md",[],[],{"skillNo":89,"name":90,"nameZh":6,"description":91,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":92,"categories":93,"keywords":94,"publishedAt":19},"01M76SQ4SB7Q4CXEGGPA75KGFK","use-delegate","Delegation mode: the host agent (Claude or Codex) plans and reviews while heavy work runs on cheap executors: OpenCode Kimi K3, Codex GPT-5.6 terra\u002Fsol. Use when the user invokes \u002Fuse-delegate, says 'use delegate', 'delegate mode', 'orchestrator mode', or wants to save tokens\u002Frate limits.","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fuse-delegate\u002FSKILL.md",[],[],{"skillNo":96,"name":97,"nameZh":6,"description":98,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":99,"categories":100,"keywords":101,"publishedAt":19},"01M76SQ24836GDGMGGPV6Z2B7N","use-artifacts","Create Claude-style local HTML artifacts under ~\u002F.agents\u002Fartifacts. Use for plans, prototypes, visualizations, dashboards, diagrams, options, or substantial reusable content, with a portable local runtime and no Anthropic API.","https:\u002F\u002Fgithub.com\u002Fzuzu59\u002Fz-skills\u002Fblob\u002Fmaster\u002Fskills\u002Fuse-artifacts\u002FSKILL.md",[],[]]