[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7B3E0SARF2TY0QJ7ZV784F3":3,"skill-same:01M7B3E0SARF2TY0QJ7ZV784F3":45},{"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":14,"repositoryHtmlUrl":27,"repositoryHomepageUrl":27,"ownerHtmlUrl":28,"ownerBlogUrl":6,"ownerDescription":29,"updatedAt":30,"install":31,"resources":44},"01M7B3E0SARF2TY0QJ7ZV784F3","vvkit-resolving-conflicts",null,"Use when a merge, rebase or cherry-pick stops on a conflict, or when integrating a branch across a rename, move or other refactor made on the other side.","vadimvitvickiy\u002Fvv-agent-kit","vadimvitvickiy","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F5019512?v=4","01M7B3ABRYF7KHBCDW6GB2XH0C","Vadim Vitvitskii","01M7B3ABSZYG9MXP1CC7BQYM25",0,"MIT","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Fcodex\u002Fplugins\u002Fvvkit\u002Fskills\u002Fvvkit-resolving-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: vvkit-resolving-conflicts\ndescription: \"Use when a merge, rebase or cherry-pick stops on a conflict, or when integrating a branch across a rename, move or other refactor made on the other side.\"\n---\n\n# Resolving conflicts\n\n**A conflict is two intents meeting, not two texts.** Picking a side per line, or pasting both\nhalves, produces code neither author wrote. Work out what each side meant, and write code that does\nboth.\n\n## Codex runtime\n\nLoad referenced skills by reading their SKILL.md. Surveyor, reviewer and runner\nskills are role instructions, not registered agent types or enforced tool allowlists.\nUse a generic subagent only when delegation is available and permitted; otherwise\nperform the role inline. Follow the active session's model, context and permission\nrules. User authorization takes precedence over imported workflow approval gates.\nClaude hooks and plugin commands are not active in this package. Existing\n`.claude\u002Fcontext\u002F` paths refer to project documents, not Codex configuration.\n\nThe hard case is a refactor on one side: it causes the hardest conflicts, and also breaks code git\nmerges without a word.\n\n## Read what the other side did first\n\n```bash\nfork=$(git merge-base \u003Cbase> HEAD)\ngit log --oneline \"$fork\"..\u003Cbase>\ngit diff -M --name-status \"$fork\" \u003Cbase>\n```\n\n- Look for a refactor: `R`, a `D` beside an `A`, a deleted file, a subject saying rename, extract,\n  move or replace. **Write down each old name with its new one.**\n- Do the same for `\"$fork\"..HEAD` — when your branch refactored, the base may have gained code in the\n  old shape.\n\n## Know which side is which\n\nUse `git -c merge.conflictStyle=zdiff3 \u003Cmerge|rebase> …`. The middle part, after `|||||||`, is the\ncommon ancestor: middle→top is one side's change, middle→bottom the other's.\n\n| Operation | Top (`HEAD`) | Bottom | The incoming commit |\n|-|-|-|-|\n| Merging the base into a branch | the branch | the base | `MERGE_HEAD` |\n| Rebasing a branch onto the base | the base, plus the commits replayed so far | the commit being replayed | `REBASE_HEAD` |\n| Cherry-picking | the current branch | the picked commit | `CHERRY_PICK_HEAD` |\n\n**A rebase swaps the sides.** \"Ours\" there keeps the base and drops your change.\n\n## Resolve onto the refactored side\n\n- Find the refactor's commit: `git log -p \"$fork\"..\u003Cbase> -- \u003Cfile>`, or\n  `git log -S'\u003Cold name>' \"$fork\"..\u003Cbase>`.\n- **Start from the refactored side** and re-apply the other side's intent in the new shape — new name,\n  signature, location. Restoring the old shape to make a hunk fit leaves two conventions.\n- **Follow moved code.** The change goes where the code lives now, maybe a file with no markers. A file\n  the other side deleted or moved is not re-added at its old path.\n- **Unclear resolution: stop and ask.** A guessed resolution reads as deliberate in every later diff.\n\n## A clean merge can still be wrong\n\nGit compares text. A new call to a renamed function, a subclass of a moved type, a file in a deleted\ndirectory — none conflict, all break. In a scratch repo, a new file calling a renamed function passed\nboth merge and rebase without a conflict and failed on import.\n\n- For every old name on your list: `git grep -n '\u003Cold name>'`. Every hit outside comments and\n  changelogs is code to update, whichever side wrote it.\n- Then build and test the integrated tree — `$vvkit-verifying-changes`. The grep finds renames only,\n  not a changed default, a reordered argument, a call that now happens twice.\n\n| Operation | The fix lands in |\n|-|-|\n| Merge | The merge commit itself — merge with `--no-commit`, so the merge commit builds |\n| Rebase | The branch commit it belongs to: `git commit --fixup \u003Ccommit>`, then `GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash \u003Cbase>` |\n\n- Leave no broken commit for a later `bisect`. `git rebase --exec '\u003Cbuild command>' \u003Cbase>` stops at\n  the first commit that fails to build.\n- **Adapting one side takes more change than that side made:** stop and say so. That is work to redo\n  on top of the refactor, and the human decides.\n\nSource for the term: Martin Fowler, \"SemanticConflict\".\n","# Resolving conflicts\n\n**A conflict is two intents meeting, not two texts.** Picking a side per line, or pasting both\nhalves, produces code neither author wrote. Work out what each side meant, and write code that does\nboth.\n\n## Codex runtime\n\nLoad referenced skills by reading their SKILL.md. Surveyor, reviewer and runner\nskills are role instructions, not registered agent types or enforced tool allowlists.\nUse a generic subagent only when delegation is available and permitted; otherwise\nperform the role inline. Follow the active session's model, context and permission\nrules. User authorization takes precedence over imported workflow approval gates.\nClaude hooks and plugin commands are not active in this package. Existing\n`.claude\u002Fcontext\u002F` paths refer to project documents, not Codex configuration.\n\nThe hard case is a refactor on one side: it causes the hardest conflicts, and also breaks code git\nmerges without a word.\n\n## Read what the other side did first\n\n```bash\nfork=$(git merge-base \u003Cbase> HEAD)\ngit log --oneline \"$fork\"..\u003Cbase>\ngit diff -M --name-status \"$fork\" \u003Cbase>\n```\n\n- Look for a refactor: `R`, a `D` beside an `A`, a deleted file, a subject saying rename, extract,\n  move or replace. **Write down each old name with its new one.**\n- Do the same for `\"$fork\"..HEAD` — when your branch refactored, the base may have gained code in the\n  old shape.\n\n## Know which side is which\n\nUse `git -c merge.conflictStyle=zdiff3 \u003Cmerge|rebase> …`. The middle part, after `|||||||`, is the\ncommon ancestor: middle→top is one side's change, middle→bottom the other's.\n\n| Operation | Top (`HEAD`) | Bottom | The incoming commit |\n|-|-|-|-|\n| Merging the base into a branch | the branch | the base | `MERGE_HEAD` |\n| Rebasing a branch onto the base | the base, plus the commits replayed so far | the commit being replayed | `REBASE_HEAD` |\n| Cherry-picking | the current branch | the picked commit | `CHERRY_PICK_HEAD` |\n\n**A rebase swaps the sides.** \"Ours\" there keeps the base and drops your change.\n\n## Resolve onto the refactored side\n\n- Find the refactor's commit: `git log -p \"$fork\"..\u003Cbase> -- \u003Cfile>`, or\n  `git log -S'\u003Cold name>' \"$fork\"..\u003Cbase>`.\n- **Start from the refactored side** and re-apply the other side's intent in the new shape — new name,\n  signature, location. Restoring the old shape to make a hunk fit leaves two conventions.\n- **Follow moved code.** The change goes where the code lives now, maybe a file with no markers. A file\n  the other side deleted or moved is not re-added at its old path.\n- **Unclear resolution: stop and ask.** A guessed resolution reads as deliberate in every later diff.\n\n## A clean merge can still be wrong\n\nGit compares text. A new call to a renamed function, a subclass of a moved type, a file in a deleted\ndirectory — none conflict, all break. In a scratch repo, a new file calling a renamed function passed\nboth merge and rebase without a conflict and failed on import.\n\n- For every old name on your list: `git grep -n '\u003Cold name>'`. Every hit outside comments and\n  changelogs is code to update, whichever side wrote it.\n- Then build and test the integrated tree — `$vvkit-verifying-changes`. The grep finds renames only,\n  not a changed default, a reordered argument, a call that now happens twice.\n\n| Operation | The fix lands in |\n|-|-|\n| Merge | The merge commit itself — merge with `--no-commit`, so the merge commit builds |\n| Rebase | The branch commit it belongs to: `git commit --fixup \u003Ccommit>`, then `GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash \u003Cbase>` |\n\n- Leave no broken commit for a later `bisect`. `git rebase --exec '\u003Cbuild command>' \u003Cbase>` stops at\n  the first commit that fails to build.\n- **Adapting one side takes more change than that side made:** stop and say so. That is work to redo\n  on top of the refactor, and the human decides.\n\nSource for the term: Martin Fowler, \"SemanticConflict\".\n",{"name":5,"description":7},"main","cc22a222a76add5759a2df5fadf231a758691db5","codex\u002Fplugins\u002Fvvkit\u002Fskills\u002Fvvkit-resolving-conflicts","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy","Senior iOS engineer. Architecture, SDKs and apps for iOS, tvOS and watchOS.","2026-11-13 19:10:29",{"source":8,"skillName":5,"commands":32,"prompt":42,"zipAvailable":43},[33,36,39],{"tool":34,"command":35},"npx","npx skills add vadimvitvickiy\u002Fvv-agent-kit --skill vvkit-resolving-conflicts",{"tool":37,"command":38},"bunx","bunx skills add vadimvitvickiy\u002Fvv-agent-kit --skill vvkit-resolving-conflicts",{"tool":40,"command":41},"pnpm","pnpm dlx skills add vadimvitvickiy\u002Fvv-agent-kit --skill vvkit-resolving-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Fcodex\u002Fplugins\u002Fvvkit\u002Fskills\u002Fvvkit-resolving-conflicts\u002FSKILL.md",true,[],[46,53,60,67,74,81],{"skillNo":47,"name":48,"nameZh":6,"description":49,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":50,"categories":51,"keywords":52,"publishedAt":19},"01M7B3JN7VG0YJ4JB8RP6HYZSJ","no-heading","Use when proving that the validator rejects a body with no H1 and a force-loading @-link.","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fskills\u002Fno-heading\u002FSKILL.md",[],[],{"skillNo":54,"name":55,"nameZh":6,"description":56,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":57,"categories":58,"keywords":59,"publishedAt":19},"01M7B3JJMEW4E710ZG6HYJ7BWV","wrong-name-does-not-match-dir","Dispatches a subagent per task and reviews between each one.","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fskills\u002Fbroken-skill\u002FSKILL.md",[],[],{"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},"01M7B3JGE9MFT1HRP41YRVKN97","writing-tests","Use when adding or changing behavior, fixing a bug, or judging whether an existing or generated test earns its place.","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-tests\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},"01M7B3JD5X32VEBDBN7HB8E17Z","writing-skills","Use when authoring or editing a skill, agent, command or hook for this kit, or when deciding whether a piece of guidance belongs in a skill at all.","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-skills\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},"01M7B3J992MZH2QVZRED0DRPD9","writing-project-instructions","Use when creating or editing a CLAUDE.md or AGENTS.md, when it has grown long, or when a rule in it also exists in an installed skill.","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-project-instructions\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},"01M7B3J55C5WPWN20QXP9ET848","writing-logs","Use when adding or reviewing log statements, or when deciding what level a message belongs at.","https:\u002F\u002Fgithub.com\u002Fvadimvitvickiy\u002Fvv-agent-kit\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-logs\u002FSKILL.md",[],[]]