chore: auto-commit ticket changes before merge (merge worktree-20260319-164427)

Author: JoeOakhartNava

.tickets/w21-h8l1.md

@@ -0,0 +1,35 @@
+---
+id: w21-h8l1
+status: open
+deps: []
+links: []
+created: 2026-03-20T05:02:35Z
+type: bug
+priority: 1
+assignee: Joe Oakhart
+---
+# Bug: merge-to-main.sh fails when main has dirty files from another worktree session
+
+
+## Notes
+
+**2026-03-20T05:02:52Z**
+
+## Bug Description
+merge-to-main.sh fails with 'ERROR: Main repo has unexpected dirty files after merge' when another worktree session left uncommitted modified files on main. The script correctly detects the dirty files but has no recovery path — it blocks the push and leaves the merge in a half-completed state.
+
+## Reproduction
+1. Session A (in another worktree) modifies files on main but doesn't commit them
+2. Session B runs merge-to-main.sh from its worktree
+3. merge-to-main.sh successfully merges the worktree branch into main
+4. Pre-push check detects dirty files (from Session A) and errors out
+5. The merge is done but not pushed — main is in a dirty state
+
+## Dirty Files Observed
+plugins/dso/hooks/auto-format.sh, plugins/dso/hooks/lib/config-paths.sh, plugins/dso/hooks/lib/pre-bash-functions.sh, plugins/dso/scripts/check-persistence-coverage.sh, plugins/dso/scripts/reset-tickets.sh, plugins/dso/scripts/sprint-next-batch.sh, plugins/dso/scripts/validate-phase.sh, plugins/dso/scripts/validate.sh
+
+## Workaround
+Rebase the worktree branch on main so the merge is a fast-forward with no dirty file interaction.
+
+## Expected Behavior
+merge-to-main.sh should either: (a) stash dirty files before merge + unstash after push, or (b) warn about dirty files and offer to proceed anyway if the dirty files are unrelated to the merge.