Menú
Use when an open-accounting PR has merge conflicts, conflicted frontend tests, stale branch state, or a pushed stage needs conflict resolution followed by local tests and PR check recovery.
Instalar con Codex o Claude Copia este prompt, pégalo en Codex, Claude u otro asistente, y deja que revise la página de la skill y la instale por ti.
Basado en la clasificación ocupacional SOC
Use when migrating data from SmartAccounts.eu into open-accounting, preparing SmartAccounts CSV/XML export snapshots, validating SmartAccounts provider preset bundles, mapping missing feature coverage, or building migration runbooks/tools for SmartAccounts cutovers.
Use when advancing open-accounting in staged PR work, especially CLI/API/docs parity, UI workflow coverage, local validation gates, commits, pushes, and PR/CI follow-through.
Use when developing or debugging open-accounting - covers multi-tenant architecture, testing strategy (especially E2E for demo interface), and layer responsibilities. Activate for feature work, bug fixes, test writing, or demo mode issues.
Use when running or debugging open-accounting local demo Playwright E2E, including demo reset, auth setup, API/frontend ports, CORS, stale localhost servers, and branch-code verification.
Use when editing open-accounting Svelte routes, components, or frontend tests, especially form payloads, tenant-scoped UI, demo E2E assertions, Svelte MCP validation, and Playwright locator stability.
Use when updating or creating open-accounting repo skills after workflow friction, repeated mistakes, user preference changes, staged PR learnings, or requests to improve the development flow.
| name | open-accounting-pr-conflict-recovery |
| description | Use when an open-accounting PR has merge conflicts, conflicted frontend tests, stale branch state, or a pushed stage needs conflict resolution followed by local tests and PR check recovery. |
Use this with open-accounting-stage-gate when GitHub says the branch has conflicts or a PR stage needs recovery after main moved.
git status --short --branch
gh pr view --json number,url,headRefName,headRefOid,mergeable,isDraft,statusCheckRollup
git fetch origin main
origin/main into the feature branch when preserving every stage commit matters. Use rebase only if the user asks for it or the branch has not been pushed.git diff --name-only --diff-filter=U
git diff --ours -- <file>
git diff --theirs -- <file>
open-accounting-frontend-workflow, run the Svelte MCP autofixer when available, and run the focused component or E2E test that owns the conflicted behavior before broader gates.Run focused checks for the conflicted surface, then enough broad checks for confidence:
git diff --check
cd frontend && bun run check
cd frontend && bun run test -- <focused-test-file>
For backend/import conflicts:
go test -count=1 ./internal/banking/mappers/...
make test-cli-coverage
go test -timeout=3m ./docs -count=1
For demo workflow conflicts, use open-accounting-demo-e2e and run the affected Playwright spec against the branch API.
gh pr view --json number,url,headRefOid,mergeable,isDraft,statusCheckRollup
gh pr checks --watch --interval 15