skills.rest
wan-huiyan
wan-huiyanCOMMUNITY
Explore all skills by this author →
GitHub

parallel-pr-template-fork-duplicates-moved-section

Diagnose silent template duplication after parallel PRs move and fork the same section.

3|Updated May 8, 2026
Search Tags:#git#code review#github#merge conflict#squash merge#parallel prs#template duplication
One-click install
npx skills add https://github.com/wan-huiyan/agent-traffic-control --skill parallel-pr-template-fork-duplicates-moved-section-wan-huiyan
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: parallel-pr-template-fork-duplicates-moved-section
Source: https://github.com/wan-huiyan/agent-traffic-control/tree/main/plugins/agent-traffic-control/skills/parallel-pr-template-fork-duplicates-moved-section
Command: npx skills add https://github.com/wan-huiyan/agent-traffic-control --skill parallel-pr-template-fork-duplicates-moved-section-wan-huiyan

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Two parallel PRs can squash-merge cleanly with no textual conflict yet leave the same UI section rendered on two different routes: one PR moved a section from template X to template Y while a sibling PR forked template Z from the pre-move version of X. Git's textual 3-way merge cannot see this semantic duplication, tests stay green, and users report the same block appearing in two places. ## Core Features & Use Cases - Diagnostic workflow: grep templates for the section's stable identifier and render routes with the framework's test client to confirm the block appears in two locations. - Timeline confirmation: use gh pr list to identify the mover PR and the forker PR by merge timestamps and diff patterns. - Fix and prevention guidance: hand-delete the duplicate from the forker's template, update affected tests, and add a cross-route uniqueness invariant test plus a rebase-before-squash policy. - Use Case: After an IA reorganization ships via several PRs, a user reports the Feature Snapshot radar chart appears on both /drivers and /library/explorer; this Skill walks you through confirming the duplication, removing it from drivers.html, and adding a uniqueness test so CI catches it next time. ## Quick Start Ask the agent to check whether a moved template section now renders on two routes and to diagnose which parallel PRs caused the duplication.

Frequently Asked Questions about parallel-pr-template-fork-duplicates-moved-section

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I detect duplicate template sections after merging parallel PRs?▼

Grep all templates for the section's stable identifier such as an id or heading text; more than one hit confirms duplication. Then render each route with the framework's test client and count occurrences to verify two routes display the same block.

Why does git not flag a conflict when two PRs duplicate a template section?▼

Git's 3-way merge operates on file-level textual diffs. When a PR forks a file into a new path, git treats it as a new file with no shared history, so a sibling PR moving content out of the original file produces no intersecting diff to conflict on.

How do I find which PRs caused the template duplication?▼

Run gh pr list with merged state, mergedAt timestamps, and file details. Look for two PRs merged close together where one moves or relocates a section and the other creates or forks a template whose added lines match the pre-move version of the source file.

Does squash-merge make this duplication problem worse?▼

Squash-merge collapses all commits into a single textual diff at merge time, so its mergeable check only verifies textual compatibility, not semantic equivalence. The same root cause can occur with other merge strategies, but squash makes detection harder.

How do I prevent duplicate sections across routes in the future?▼

Rebase the forking PR onto current main before squash-merging when related files changed, and add a cross-route uniqueness test asserting each canonical section appears on exactly one route. This catches duplication at CI time regardless of merge order.

Related Skills

Explore More Software Engineering Skills→
igrekplusigrekplus

parallel_worktree

Coordinate AI sessions across branches and worktrees with naming rules.

Community
Intermediate
Intelligent-Resourcing-Team-EnvironmentIntelligent-Resourcing-Team-Environment

babysit

Monitor pull request checks, reviews, and comments until mergeable.

Official
Intermediate
generic-automation-and-itgeneric-automation-and-it

git-sync

Sync the current branch with origin/main and resolve merge conflicts.

Official
Intermediate
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced