[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6DNGTYKMJCCXFHHB5A8174Y":3,"skill-same:01M6DNGTYKMJCCXFHHB5A8174Y":62},{"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":36,"linkOnly":37,"markdownContent":38,"markdownBody":39,"frontMatter":40,"refName":41,"commitSha":42,"skillDirectory":43,"forksCount":44,"repositoryHtmlUrl":45,"repositoryHomepageUrl":6,"ownerHtmlUrl":46,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":47,"install":48,"resources":61},"01M6DNGTYKMJCCXFHHB5A8174Y","aac-resolving-merge-conflicts",null,"Resolve an in-progress git merge or rebase conflict. Use when git reports CONFLICT, when conflict markers (`\u003C\u003C\u003C\u003C\u003C\u003C\u003C`, `=======`, `>>>>>>>`) appear in a file, or when the user is stuck on a merge\u002Frebase that will not complete. Standalone loop — no dependencies on other skills.","msayedshokry\u002FAgileAgentCanvasExt","msayedshokry","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F35009459?v=4","01M6DN5RZZ297CGWTNJ6ERZQ8W","Mohamed Sayed","01M6DN5S4XS7SVCSXZRW2XR0XF",3,"MIT","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Fskills\u002Faac-resolving-merge-conflicts\u002FSKILL.md",[],[19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35],"merge","aac resolving merge conflicts","conflicts","merge conflicts","resolving merge conflicts","file","loop","rebase","user","use","reports","git","git merge","dependencies","conflict","progress","complete","2026-11-10 10:12:30",false,"---\nname: aac-resolving-merge-conflicts\ndescription: 'Resolve an in-progress git merge or rebase conflict. Use when git reports CONFLICT, when conflict markers (`\u003C\u003C\u003C\u003C\u003C\u003C\u003C`, `=======`, `>>>>>>>`) appear in a file, or when the user is stuck on a merge\u002Frebase that will not complete. Standalone loop — no dependencies on other skills.'\n---\n\n# Resolving Merge Conflicts\n\nA loop for unsticking an in-progress git merge or rebase. The trigger is a file with conflict markers in the working tree. The exit is a clean working tree, ready to commit.\n\nThe skill is **standalone** — it does not invoke other skills. Domain-specific decisions (which side of the conflict is \"right\") still need the human or the project's domain model.\n\n## The loop\n\n### 1. Confirm you are in a conflict\n\n```bash\ngit status\n```\n\n`Unmerged paths` (for `merge`) or `interactive rebase in progress` \u002F `rebase in progress` (for `rebase`) confirms the state. If neither, you are not in a conflict — stop and tell the user.\n\nFor a **merge**, list the conflicted files:\n\n```bash\ngit diff --name-only --diff-filter=U\n```\n\nFor a **rebase**, the same command works; the conflict markers are written into the affected files the same way.\n\n### 2. For each conflicted file\n\n**Read the file, do not skim it.** A merge conflict is not a comment to delete. Each marker block encodes a decision; the right resolution depends on what the file is *for*, not on which marker looks longer.\n\nThe marker anatomy:\n\n```\n\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD\n\u003Cthe version on the current branch>\n=======\n\u003Cthe version being merged in>\n>>>>>>> \u003Cbranch-or-commit-ref>\n```\n\nThree cases dominate, and each has a different right answer:\n\n- **Both sides changed the same lines, same way** — keep one copy, delete the markers. Use `git checkout --ours` or `--theirs` to take one side wholesale, then delete the markers if any remain.\n- **Both sides changed the same lines, differently** — read both versions, understand the *intent* of each, and combine. A real combination is not picking one side; it is a synthesis that keeps both intents. If the intents are incompatible, **stop and ask the human** — this is the case where a wrong call is a silent bug.\n- **One side added code the other side did not touch** — keep the addition. The markers usually bracket unrelated regions; delete them without losing content.\n\n### 3. After each file is resolved\n\nMark it resolved:\n\n```bash\ngit add \u003Cfile>\n```\n\n`git add` on a file with conflict markers still in it will fail. The markers must be gone first.\n\n### 4. After all files are resolved\n\nFor a **merge**:\n\n```bash\ngit commit   # git writes the merge commit message for you; review before saving\n```\n\nFor a **rebase**:\n\n```bash\ngit rebase --continue\n```\n\nFor a **rebase** that has gone wrong beyond repair, abandon it:\n\n```bash\ngit rebase --abort\n```\n\nFor a **merge** that has gone wrong beyond repair:\n\n```bash\ngit merge --abort\n```\n\n`--abort` is the right call when the conflict surface is wider than expected or the two branches have diverged too far. A clean re-merge from a known state beats a stitched-together one.\n\n## Halt conditions\n\nStop and ask the human when:\n\n- The two sides change the same logic in incompatible ways and you cannot tell which intent the project prefers (no test, no ADR, no `project-context.md` entry to lean on)\n- The conflict exposes a question that was not asked in either branch — the right resolution might be a new commit, not a marker delete\n- The resolution would touch more than ~3 files in ways the user did not anticipate — this is a \"stop and replan\" signal, not a \"keep going\" signal\n\n## Anti-patterns\n\n- **`git checkout --ours` on every conflict** — fast, and almost always wrong. The conflicts are there because the two branches disagreed; \"ours\" by default is just refusing to look.\n- **Deleting the markers without checking the content** — leaves the file in whatever state the merge tool wrote, which can include a half-and-half that does not parse.\n- **Resolving without running anything** — at minimum, run the project's typecheck (`tsc`, `mypy`, etc.) and the test suite after resolving. A conflict resolution that does not typecheck is not a resolution.\n- **Forgetting a file** — `git diff --name-only --diff-filter=U` after every batch of resolutions catches the ones you missed.\n","# Resolving Merge Conflicts\n\nA loop for unsticking an in-progress git merge or rebase. The trigger is a file with conflict markers in the working tree. The exit is a clean working tree, ready to commit.\n\nThe skill is **standalone** — it does not invoke other skills. Domain-specific decisions (which side of the conflict is \"right\") still need the human or the project's domain model.\n\n## The loop\n\n### 1. Confirm you are in a conflict\n\n```bash\ngit status\n```\n\n`Unmerged paths` (for `merge`) or `interactive rebase in progress` \u002F `rebase in progress` (for `rebase`) confirms the state. If neither, you are not in a conflict — stop and tell the user.\n\nFor a **merge**, list the conflicted files:\n\n```bash\ngit diff --name-only --diff-filter=U\n```\n\nFor a **rebase**, the same command works; the conflict markers are written into the affected files the same way.\n\n### 2. For each conflicted file\n\n**Read the file, do not skim it.** A merge conflict is not a comment to delete. Each marker block encodes a decision; the right resolution depends on what the file is *for*, not on which marker looks longer.\n\nThe marker anatomy:\n\n```\n\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD\n\u003Cthe version on the current branch>\n=======\n\u003Cthe version being merged in>\n>>>>>>> \u003Cbranch-or-commit-ref>\n```\n\nThree cases dominate, and each has a different right answer:\n\n- **Both sides changed the same lines, same way** — keep one copy, delete the markers. Use `git checkout --ours` or `--theirs` to take one side wholesale, then delete the markers if any remain.\n- **Both sides changed the same lines, differently** — read both versions, understand the *intent* of each, and combine. A real combination is not picking one side; it is a synthesis that keeps both intents. If the intents are incompatible, **stop and ask the human** — this is the case where a wrong call is a silent bug.\n- **One side added code the other side did not touch** — keep the addition. The markers usually bracket unrelated regions; delete them without losing content.\n\n### 3. After each file is resolved\n\nMark it resolved:\n\n```bash\ngit add \u003Cfile>\n```\n\n`git add` on a file with conflict markers still in it will fail. The markers must be gone first.\n\n### 4. After all files are resolved\n\nFor a **merge**:\n\n```bash\ngit commit   # git writes the merge commit message for you; review before saving\n```\n\nFor a **rebase**:\n\n```bash\ngit rebase --continue\n```\n\nFor a **rebase** that has gone wrong beyond repair, abandon it:\n\n```bash\ngit rebase --abort\n```\n\nFor a **merge** that has gone wrong beyond repair:\n\n```bash\ngit merge --abort\n```\n\n`--abort` is the right call when the conflict surface is wider than expected or the two branches have diverged too far. A clean re-merge from a known state beats a stitched-together one.\n\n## Halt conditions\n\nStop and ask the human when:\n\n- The two sides change the same logic in incompatible ways and you cannot tell which intent the project prefers (no test, no ADR, no `project-context.md` entry to lean on)\n- The conflict exposes a question that was not asked in either branch — the right resolution might be a new commit, not a marker delete\n- The resolution would touch more than ~3 files in ways the user did not anticipate — this is a \"stop and replan\" signal, not a \"keep going\" signal\n\n## Anti-patterns\n\n- **`git checkout --ours` on every conflict** — fast, and almost always wrong. The conflicts are there because the two branches disagreed; \"ours\" by default is just refusing to look.\n- **Deleting the markers without checking the content** — leaves the file in whatever state the merge tool wrote, which can include a half-and-half that does not parse.\n- **Resolving without running anything** — at minimum, run the project's typecheck (`tsc`, `mypy`, etc.) and the test suite after resolving. A conflict resolution that does not typecheck is not a resolution.\n- **Forgetting a file** — `git diff --name-only --diff-filter=U` after every batch of resolutions catches the ones you missed.\n",{"name":5,"description":7},"main","473351382920a74eb8f353f979a06f6f05bb5f59","resources\u002F_aac\u002Fskills\u002Faac-resolving-merge-conflicts",0,"https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt","https:\u002F\u002Fgithub.com\u002Fmsayedshokry","2026-08-29 02:00:07",{"source":8,"skillName":5,"commands":49,"prompt":59,"zipAvailable":60},[50,53,56],{"tool":51,"command":52},"npx","npx skills add msayedshokry\u002FAgileAgentCanvasExt --skill aac-resolving-merge-conflicts",{"tool":54,"command":55},"bunx","bunx skills add msayedshokry\u002FAgileAgentCanvasExt --skill aac-resolving-merge-conflicts",{"tool":57,"command":58},"pnpm","pnpm dlx skills add msayedshokry\u002FAgileAgentCanvasExt --skill aac-resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Fskills\u002Faac-resolving-merge-conflicts\u002FSKILL.md",true,[],[63,91,110,123,146,162],{"skillNo":64,"name":65,"nameZh":6,"description":66,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":67,"categories":68,"keywords":79,"publishedAt":36},"01M6DNRTHE3M1XG3KDJTEF6BG6","bmad-teach-me-testing","Teach testing progressively through structured sessions. Use when user says \"lets learn testing\" or \"I want to study test practices\"","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Ftea\u002Fworkflows\u002Ftestarch\u002Fbmad-teach-me-testing\u002FSKILL.md",[69,74],{"categoryNo":70,"categoryName":71,"taxonomyType":72,"taxonomyTypeDesc":73},"01JBSEEDCAT000000000000008","测试与质量","SCENARIO","使用场景",{"categoryNo":75,"categoryName":76,"taxonomyType":77,"taxonomyTypeDesc":78},"01JBSEEDCAT000000000000039","教师与教育","PROFESSION","适用职业",[80,81,82,83,84,85,86,87,88,27,28,89,90],"bmad","me","bmad teach me testing","teach me","teach","testing","test","sessions","learn","study","structured",{"skillNo":92,"name":93,"nameZh":6,"description":94,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":95,"categories":96,"keywords":98,"publishedAt":36},"01M6DNRG27V77JEGMPMJVRY0Q5","aac-testarch-trace","Generate traceability matrix and quality gate decision. Use when the user says \"lets create traceability matrix\" or \"I want to analyze test coverage\"","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Ftea\u002Fworkflows\u002Ftestarch\u002Faac-testarch-trace\u002FSKILL.md",[97],{"categoryNo":70,"categoryName":71,"taxonomyType":72,"taxonomyTypeDesc":73},[99,100,86,101,102,103,104,105,106,27,107,28,108,109],"aac testarch trace","trace","quality gate","create","generate","analyze","quality","decision","coverage","test coverage","gate",{"skillNo":111,"name":112,"nameZh":6,"description":113,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":114,"categories":115,"keywords":117,"publishedAt":36},"01M6DNR70G1S0DGDSHRWT1S1DD","aac-testarch-test-review","Review test quality using best practices validation. Use when user says \"lets review tests\" or \"I want to evaluate test quality\"","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Ftea\u002Fworkflows\u002Ftestarch\u002Faac-testarch-test-review\u002FSKILL.md",[116],{"categoryNo":70,"categoryName":71,"taxonomyType":72,"taxonomyTypeDesc":73},[118,119,86,120,121,105,27,28,122],"review","aac testarch test review","best practices","validation","tests",{"skillNo":124,"name":125,"nameZh":6,"description":126,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":127,"categories":128,"keywords":136,"publishedAt":36},"01M6DNQXV8F40EE78ZMWGWRPJM","aac-testarch-test-design","Create system-level or epic-level test plans. Use when the user says \"lets design test plan\" or \"I want to create test strategy\"","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Ftea\u002Fworkflows\u002Ftestarch\u002Faac-testarch-test-design\u002FSKILL.md",[129,130,133],{"categoryNo":70,"categoryName":71,"taxonomyType":72,"taxonomyTypeDesc":73},{"categoryNo":131,"categoryName":132,"taxonomyType":72,"taxonomyTypeDesc":73},"01JBSEEDCAT000000000000015","视觉设计",{"categoryNo":134,"categoryName":135,"taxonomyType":77,"taxonomyTypeDesc":78},"01JBSEEDCAT000000000000032","设计师",[137,138,86,139,27,102,140,141,142,143,28,144,145],"aac testarch test design","test design","design","test plan","plan","system","strategy","test strategy","plans",{"skillNo":147,"name":148,"nameZh":6,"description":149,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":150,"categories":151,"keywords":152,"publishedAt":36},"01M6DNQNG0T7Q5DKV3C03RY35D","aac-testarch-nfr","Audit NFR evidence for performance, security, reliability, and scalability. Use when implementation evidence exists and the user says \"audit NFR evidence\", \"audit NFRs\", or \"evaluate non-functional requirements\"","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Ftea\u002Fworkflows\u002Ftestarch\u002Faac-testarch-nfr\u002FSKILL.md",[],[153,154,155,156,157,158,27,159,160,28,161],"aac testarch nfr","reliability","evidence","implementation","scalability","requirements","audit","performance","security",{"skillNo":163,"name":164,"nameZh":6,"description":165,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":166,"categories":167,"keywords":169,"publishedAt":36},"01M6DNQDPTGB49D8AAJV4GN2H8","aac-testarch-framework","Initialize test framework with Playwright or Cypress. Use when the user says \"lets setup test framework\" or \"I want to initialize testing framework\"","https:\u002F\u002Fgithub.com\u002Fmsayedshokry\u002FAgileAgentCanvasExt\u002Fblob\u002Fmain\u002Fresources\u002F_aac\u002Ftea\u002Fworkflows\u002Ftestarch\u002Faac-testarch-framework\u002FSKILL.md",[168],{"categoryNo":70,"categoryName":71,"taxonomyType":72,"taxonomyTypeDesc":73},[170,171,172,27,28,173,174,175,86,176,85,177],"aac testarch framework","framework","initialize","testing framework","setup","test framework","playwright","cypress"]