Menu
Recover intentional work from a dirty checkout whose branch is already merged
Installer avec Codex ou Claude Copiez ce prompt, collez-le dans Codex, Claude ou un autre assistant, puis laissez-le vérifier la page du skill et l'installer pour vous.
Basé sur la classification professionnelle SOC
Squad branching model: main-only workflow with feature branches
{what this skill teaches agents}
Wire legacy .NET Framework service hosts through Enterprise Library-flavored appSettings so Unity, service location, exception policies, logging, and database aliases all hang off one configuration seam.
Build internal order-management Web Forms pages with ObjectDataSource, GridView, DetailsView, and ViewState-heavy filter handling.
Build a believable mid-2000s .NET data layer around connection catalogs, stored-procedure wrappers, DataSets, and repository facades.
Anchor store-ops workbench screens in separate StoreOps tables for order state, status snapshots, workforce alerts, and zone bulletins, with dispatch tickets linked back to orders.
| name | merged-checkout-salvage |
| description | Recover intentional work from a dirty checkout whose branch is already merged |
| domain | workflow |
| confidence | high |
| source | team-discovery |
Use this when a local checkout is still dirty after its branch or PR has already merged, especially if the worktree mixes real source changes with stale branch drift and generated build output.
main as authoritative and inspect the dirty checkout against main, not just against HEAD.bin/, obj/, and workspace noise.main and re-apply only the intentional changes there.A merged stale checkout is no longer a trustworthy integration surface. Rebuilding the intentional work on top of current main prevents accidental reversion of code, docs, SQL assets, and team-state that landed after the original branch diverged.