What problem does it solve? When two parallel PRs touch the same file — one refreshing values, the other rewriting copy — git's 3-way merge can silently take the stale-base PR's version, reverting the first PR's changes with no conflict, no CI failure, and no visible signal. This Skill detects that silent regression and recovers the lost content without destroying the second PR's legitimate work. ## Core Features & Use Cases - Content-level detection: Grep post-merge main for the upstream PR's distinctive anchored strings and compare against its merge commit to confirm which lines regressed. - Targeted recovery: Re-apply the lost values inside the sibling PR's rewritten text via targeted edits, instead of reverting the whole merge or checking out the old file. - Complete-file revert variant: Handle the severe case where a wholesale template rewrite is fully restored to its pre-PR state, using git checkout <merge-commit> -- <file> plus re-layering the sibling's genuine fixes. - Use Case: PR A refreshes dashboard numbers in a template and merges; PR B, based on pre-A main, polishes the same copy and merges four minutes later claiming "all numbers preserved." The live page now shows stale values while backend constants are correct — this Skill walks you through confirming the regression, inventorying lost lines, and shipping a recovery PR. ## Quick Start Audit the most recent merge by grepping origin/main for the upstream PR's distinctive new values and comparing against its merge commit, then follow the recovery steps to restore any missing content.
