Additive conflicts only — no logic clash: - types.ts: keep SCM.preflight?() from main - index.ts: keep pipeline exports + windows-pty-registry/daemon-children exports (main) - program.ts: keep pipeline/stage/artifact commands + registerConfig (main) - .gitleaks.toml: allowlist canonical example tokens used in activity-events test fixtures |
||
|---|---|---|
| .. | ||
| ao | ||
| cli | ||
| core | ||
| integration-tests | ||
| plugins | ||
| web | ||