搵技能.../

Guarding Branches | Skills Pool

技能檔案

Guarding Branches

Enforce protected-branch guardrails for safe PR lifecycle, conflict resolution, and merge safety. Use when working on feature branches against protected main: before merging feature PRs, resolving merge conflicts, syncing with main, or managing work-item updates on protected branches.

squirrel2890 星標2026年3月6日

職業
分類: 電子商務

技能內容

Protect merge integrity and prevent accidental deletions or regressions when working with protected main branches.

When to Use

Before merging a feature branch to protected main
When resolving merge conflicts with main
When syncing a feature branch with main for PR updates
When updating work items on protected main
When multiple parallel work items risk cross-branch contamination

Core Guardrails

1. Mergeability Check

Before opening or updating a PR:

Verify the feature branch has no uncommitted changes: git status
Fetch latest main: git fetch origin main
Check PR mergeable state: gh pr view <pr-number> --json mergeable
If mergeable is CONFLICTING, run merge conflict resolution (step 3).

Fail if: PR is marked UNMERGEABLE or branch protection rules are violated. Do not bypass with or flags.

相關技能

快速安裝

Guarding Branches

npx skills add squirrel289/pax

下載 Skill 打開源碼倉庫

作者: squirrel289
星標: 0
更新時間: 2026年3月6日
職業

本頁內容

01When to Use 02

--admin

--force

2. Merge Conflict Resolution

When main diverges and PR shows conflicts:

Sync feature branch with main: git merge origin/main --no-edit
If conflicts occur:
- Resolve conflicts manually in conflicting files
- Re-run affected tests locally to validate fixes
- Stage resolved files: git add <resolved-file>
Commit merge: git commit -m "chore: merge main into <branch-name>"
Verify no deletions: git diff origin/main...HEAD --name-status | grep '^D' — if deletions appear, restore from known-good commit
Push updated branch: git push

Fail if: Merge introduces unintended file deletions. Restore and add regression tests.

3. Export and Type Conflict Scan

When merging providers (diagnostic, intellisense, etc.):

After merge, scan src/packages/volar/src/index.ts (or equivalent) for duplicate exports: rg "export \* from" <file>
If two providers export the same type (e.g., TemplateDelimiters), rename one to disambiguate (e.g., IntellisenseDelimiters)
Run TypeScript check: pnpm run type:check — must pass with no errors
Re-run tests: pnpm test:affected:ci — must pass

Fail if: Type conflicts remain after rename or tests fail.

4. Diff Against Main

After merge, verify no unexpected deletions or mutations:

Run: git diff origin/main...HEAD --name-status
Review D (deleted) files — should only be intentional deletions
Review M (modified) files — should only touch intended source files
If work-item files were merged from main, restore them: git restore <backlog-file>

Fail if: Unintended deletions or cross-branch contamination detected.

5. Protected Main Updates

When updating work items or documentation on protected main:

Never push directly to main — always use a PR, even for small changes
If main is protected, create a dedicated PR for work-item status updates (e.g., docs(backlog): mark WI-XXX ready-for-review)
Validate frontmatter before committing: pnpm run lint:frontmatter
Use squash or rebase merges to keep history clean

Fail if: Attempting to bypass protection rules. Request an exception through branch-admin interface if truly necessary.

Integration with Other Skills

executing-backlog: References this aspect at orchestration gates (mergeability, conflict resolution, diff checks)
updating-work-item: References this aspect in "in-progress" and "ready-for-review" transitions
parallel-execution: Uses this aspect to validate each workspace's branch state before checkout

Troubleshooting

Merge conflicts not resolved?

Manually inspect conflicting file
Check git status: git status --porcelain
Resolve with editor, then stage and commit

Type conflicts after merge?

Search for duplicate exports: rg "export.*<typename>" <file>
Rename one variant (e.g., append provider prefix)
Re-run type check

Unintended deletions detected?

Identify deleted files: git diff origin/main...HEAD --name-status | grep '^D'
Restore from main: git show origin/main:<file> > <file>
Commit restoration: git add <file> && git commit -m "chore: restore deleted file"
Add regression test to prevent recurrence

Core Guardrails

031. Mergeability Check

042. Merge Conflict Resolution

053. Export and Type Conflict Scan

064. Diff Against Main

075. Protected Main Updates

08Integration with Other Skills

09Troubleshooting

軟件開發人員

Ordercli

Foodora-only CLI for checking past orders and active order status (Deliveroo WIP).

Deployment Patterns

Deployment iş akışları, CI/CD pipeline kalıpları, Docker konteynerizasyonu, sağlık kontrolleri, rollback stratejileri ve web uygulamaları için üretim hazırlığı kontrol listeleri.

Junta Leiloeiros

Coleta e consulta dados de leiloeiros oficiais de todas as 27 Juntas Comerciais do Brasil. Scraper multi-UF, banco SQLite, API FastAPI e exportacao CSV/JSON.

Persona Sales Ops

Manage sales workflows — track deals, schedule calls, client comms.

googleworkspace25.0k

Eliza App Development

Use when building or changing an elizaOS-based application in this repository. Covers eliza app architecture, monorepo layout, local versus remote versus cloud routing, where to edit features, and non-negotiable runtime constraints. Eliza is the product name of this particular eliza app checkout.

Ordercli

Foodora-only CLI for checking past orders and active order status (Deliveroo WIP). Use when the user asks to check food delivery orders, track a Foodora delivery, view order history, reorder a meal, look up past food orders, check delivery status, or manage Foodora sessions and authentication.

軟件開發人員