39f0df45d5
mergeSliceToMain now runs git reset --hard if git merge --squash fails, restoring a clean working tree instead of leaving conflict markers. The merge guard catch block in auto.ts now: 1. Detects leftover conflicted state (UU/AA/UD in porcelain status) 2. Resets the working tree if conflicts remain 3. Stops auto-mode with a clear error instead of continuing with corrupted .gsd/ state files that cause an infinite dispatch loop Also fixes conflict markers in loader.ts, logo.ts, and postinstall.js that were baked into main from a prior bad merge resolution. |
||
|---|---|---|
| .. | ||
| install-pi-global.js | ||
| postinstall.js | ||
| sync-pkg-version.cjs | ||
| uninstall-pi-global.js | ||
| verify-s03.sh | ||
| verify-s04.sh | ||