What problem does it solve? Merging another branch often produces conflicts that are resolved mechanically by keeping one side, losing the intent of the other. This Skill merges a specified branch (defaulting to main) into the current branch, reads both sides of each conflict, and resolves them based on what each change is trying to accomplish, ending with a proper merge commit. ## Core Features & Use Cases - Intent-aware conflict resolution: Reads both HEAD and incoming changes to choose a resolution that satisfies both sides rather than blindly picking one. - Post-merge verification: Runs lint, type checks, and tests even when no conflicts occur, catching broken references and dead imports that git cannot detect. - Regeneration of generated files: Rebuilds mocks and generated test files instead of hand-merging them. - Use Case: You are on a feature branch and say "main を取り込んで" — the Skill fetches origin/main, merges it, resolves any conflicts file by file, runs checks, and creates the merge commit without pushing. ## Quick Start Ask the assistant to merge main into the current branch and resolve any conflicts, for example by saying "main を取り込んでコンフリクトを解消して".
