3 Commits

Include renames

Author	SHA1	Message	Date
Bot	e357907ee6	fix(git-guard): add unmerged-path guard + concrete remediation syntax for every failure branch ... Adds the unmerged-conflict guard flagged in PR review: before the dirty-tree flow can run, check `git ls-files -u` and refuse to auto-commit if unresolved merge conflict markers are present (e.g. left behind by a prior run's failed `git stash pop`). Without this, a re-run's `git add -A` would silently stage literal <<<<<<< / ======= / >>>>>>> markers into a real commit and push them to origin/main. Also expands every failure-path message (stash-push failure, stash-pop conflict vs. untracked-file-collision, resync failure, true divergence, manual-abort cases) to include concrete, copy-pasteable remediation command sequences with multiple options (resolve-in-place vs. abandon-and-reapply vs. drop-if-unneeded), rather than a single generic hint. The true-divergence message now also tells the operator to check `git stash list` first, so a stash created by the new dirty+stale path isn't confused with a second manually-created one. No change to the common dirty-but-current or clean-but-stale behavior.	2026-09-09 13:47:14 -07:00
Bot	bd69cc85d5	fix(git-guard): stash-before-commit when dirty tree is also stale vs origin ... Previously the dirty-tree branch committed unconditionally, then only discovered staleness/divergence when the push was rejected -- leaving a doomed auto-commit sitting on a stale base. Root-caused from a real incident: a stray on-disk edit to ai/ai.yaml sat on a checkout that was already 4 commits behind, git-guard auto-committed on top of it, then the push was rejected (ahead 1, behind 4), aborting the deploy. Fix: when DIRTY=1 and LOCAL != REMOTE, stash the dirty changes first, resync main with origin using the exact same behind/ahead/diverged rules as the clean-tree path (now shared via resync_with_origin()), then reapply the stash and re-run. Never commits on top of a stale base again. On any failure the stash is preserved and printed for manual recovery -- changes are never silently lost.	2026-09-09 10:42:21 -07:00
admin	0bc117c868	Add: git-guard.sh - pre-deploy sync check to prevent local/Gitea divergence	2026-08-26 22:30:47 -07:00