[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M786PNR0NDK3H6YAVGS9EBHW":3,"skill-same:01M786PNR0NDK3H6YAVGS9EBHW":43},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":15,"categories":16,"keywords":17,"publishedAt":18,"linkOnly":19,"markdownContent":20,"markdownBody":21,"frontMatter":22,"refName":23,"commitSha":24,"skillDirectory":25,"forksCount":13,"repositoryHtmlUrl":26,"repositoryHomepageUrl":6,"ownerHtmlUrl":27,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":28,"install":29,"resources":42},"01M786PNR0NDK3H6YAVGS9EBHW","resolving-merge-conflicts",null,"Systematic merge conflict resolution that understands why each side made its change before choosing a resolution.","lynchypin\u002Fproject-onboard","lynchypin","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F188926056?v=4","01M786MTZ83KEFY14AD3V2RZ7Y","01M786MTZTPSKAVRY9WFHS792H",0,"MIT","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: resolving-merge-conflicts\ndescription: Systematic merge conflict resolution that understands why each side made its change before choosing a resolution.\n---\n\n# Resolving merge conflicts\n\n## Process\n\n1. **See the current state** — check git history and list conflicting\n   files.\n\n2. **Find primary sources** for each conflict — understand why each\n   side made its change. Review commit messages, PRs, and original\n   tickets.\n\n3. **Resolve each hunk** preserving both intents where possible. When\n   incompatible, select the resolution matching the merge's stated goal\n   and document the trade-off in the commit message. Never invent new\n   behavior that neither side intended.\n\n4. **Run automated checks** — typecheck, tests, format. Fix any\n   breakage introduced by the resolution.\n\n5. **Finish the merge\u002Frebase** — stage everything and commit. If\n   rebasing, continue until all commits are applied.\n\n## What this skill must never do\n\n- Never resolve by silently dropping one side's changes.\n- Never invent new behavior — only combine or choose existing intents.\n- Never skip automated checks after resolution.\n- Never abort without attempting resolution first.\n","# Resolving merge conflicts\n\n## Process\n\n1. **See the current state** — check git history and list conflicting\n   files.\n\n2. **Find primary sources** for each conflict — understand why each\n   side made its change. Review commit messages, PRs, and original\n   tickets.\n\n3. **Resolve each hunk** preserving both intents where possible. When\n   incompatible, select the resolution matching the merge's stated goal\n   and document the trade-off in the commit message. Never invent new\n   behavior that neither side intended.\n\n4. **Run automated checks** — typecheck, tests, format. Fix any\n   breakage introduced by the resolution.\n\n5. **Finish the merge\u002Frebase** — stage everything and commit. If\n   rebasing, continue until all commits are applied.\n\n## What this skill must never do\n\n- Never resolve by silently dropping one side's changes.\n- Never invent new behavior — only combine or choose existing intents.\n- Never skip automated checks after resolution.\n- Never abort without attempting resolution first.\n",{"name":5,"description":7},"main","1f0ae11cd93f456cd58d3fd7cd470d1105a00ebf","skills\u002Fresolving-merge-conflicts","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard","https:\u002F\u002Fgithub.com\u002Flynchypin","2026-08-05 20:49:36",{"source":8,"skillName":5,"commands":30,"prompt":40,"zipAvailable":41},[31,34,37],{"tool":32,"command":33},"npx","npx skills add lynchypin\u002Fproject-onboard --skill resolving-merge-conflicts",{"tool":35,"command":36},"bunx","bunx skills add lynchypin\u002Fproject-onboard --skill resolving-merge-conflicts",{"tool":38,"command":39},"pnpm","pnpm dlx skills add lynchypin\u002Fproject-onboard --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[],[44,51,58,65,72,79],{"skillNo":45,"name":46,"nameZh":6,"description":47,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":48,"categories":49,"keywords":50,"publishedAt":18},"01M786SAS70MSPYGGFVG7SNH8J","wayfinder","The orchestration hub for all work. Creates a map of investigation tickets (grilling, research, prototype, task, bug), resolves them one at a time with strict grilling discipline, manages risk posture pauses during implementation, and hands off to to-spec when the map is complete. Use for any work regardless of size — a trivial task has a small map, a large migration has many tickets.","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fwayfinder\u002FSKILL.md",[],[],{"skillNo":52,"name":53,"nameZh":6,"description":54,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":55,"categories":56,"keywords":57,"publishedAt":18},"01M786S1VW2DFFP7SGGVYYEN45","to-tickets","Break the spec into small, independently-implementable tracer-bullet vertical slices. No checkpoint gate — hands off directly to wayfinder for implementation orchestration.","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fto-tickets\u002FSKILL.md",[],[],{"skillNo":59,"name":60,"nameZh":6,"description":61,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":62,"categories":63,"keywords":64,"publishedAt":18},"01M786RHCR9MPJP7MKN1T98FAD","to-spec","Synthesize a specification from the completed wayfinder map. Never runs its own interview — it only writes down what wayfinder's grilling tickets already established, at a depth proportional to the project's documentation tier.","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fto-spec\u002FSKILL.md",[],[],{"skillNo":66,"name":67,"nameZh":6,"description":68,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":69,"categories":70,"keywords":71,"publishedAt":18},"01M786R5N3VQCWWDN3CWB4A01S","tdd","Reference material for test-driven development discipline. Red before green, one slice at a time. Use as reference during implementation, not as a step-by-step procedure.","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Ftdd\u002FSKILL.md",[],[],{"skillNo":73,"name":74,"nameZh":6,"description":75,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":76,"categories":77,"keywords":78,"publishedAt":18},"01M786QPV9NMXZ4Y6HF1X7MHVF","start-session","Orient a new session in any project directory. Detects empty directory, existing codebase, or resume state, gathers cheap signals, and routes to wayfinder. The only user-invoked entry point.","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fstart-session\u002FSKILL.md",[],[],{"skillNo":80,"name":81,"nameZh":6,"description":82,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":83,"categories":84,"keywords":85,"publishedAt":18},"01M786QAH76026WCTPAVYJAZ79","setup","Configures the issue tracker. Called by start-session during first orient. Model-invoked — runs automatically as part of the flow, not user-triggered.","https:\u002F\u002Fgithub.com\u002Flynchypin\u002Fproject-onboard\u002Fblob\u002Fmain\u002Fskills\u002Fsetup\u002FSKILL.md",[],[]]