large-redesign-parallel-branch-collision-auditlisted

Before starting a large-scale redesign (10+ PRs that rewrite shared files like templates, base layouts, or central views), audit ALL unmerged feature branches for commits that touch the same files. Use when: (1) the user asks for a multi-PR redesign / restructure / migration, (2) the worktree is at the top of main but other long-running branches exist with active work, (3) the redesign will replace files wholesale (template rewrites, route extractions, base.css migrations), (4) the project has a multi-branch flow (one main per client/deployment, e.g. `main` + `starbucks-uk` + `feature/whitelabel-X`). Symptom of having skipped this audit: hours after the redesign ships, cherry-picking the parallel branch's work into main produces a head-on conflict on the rewritten file (often progress.html / report.html / a base template), and the parallel branch's a11y / safety / hotfix commits are stranded — they must be hand-merged into the new markup rather than cleanly cherry-picked. Sister to `pre-merge-client-variant-r
wan-huiyan/overnight-workflows · ★ 1 · Web & Frontend · score 71

Install: claude install-skill wan-huiyan/overnight-workflows

# Large-Redesign Parallel-Branch Collision Audit ## Problem You're about to start a large multi-PR redesign that branches from `main`. The branch is clean, tests are green, the plan is locked. You execute 14 PRs overnight, all merge cleanly to main. The next day someone asks: "What about the changes on `starbucks-uk` / `feature/whitelabel-X` / `staging-customer-Y`?" — and you discover that long-running branch has 10 unmerged commits, including a11y/safety hotfixes on a file (`progress.html`, `report.html`, `_base.html`) that your redesign has just **completely rewritten** with the bold-editorial markup. Now those 10 commits can't be cherry-picked cleanly. The a11y improvements you'd want to keep (innerHTML→DOM migration, button-onclick→href fixes, focus-trap fixes) collide directly with the redesigned markup. Hand-merge required, possibly losing safety improvements if not careful. The root cause: **the redesigner audited main, not main + parallel branches.** ## Context / Trigger Conditions Use this audit BEFORE starting work when **all** of these apply: 1. The user requests a multi-PR redesign / migration / restructure (anything that will rewrite ≥3 templates, the base layout, central views, or shared CSS) 2. The repo has a multi-branch flow — long-running parallel branches that aren't trivially behind main: - Client-variant branches (`starbucks-uk`, `client-acme`) - Staging branches (`feature/whitelabel-X`) - Pending feature branches with unmerged work 3. Th