▣ wi

gitmerge.sh diverged-branch newest-wins auto-adds untracked files, defeats gitpush --only strict-staging

Ref

#623 (#623)

Project

llmmsg-srv

Status

backlog

Priority

normal

Type

bug

Assigned

bin-whey-cc

Created by

—

Created

2026-06-03T16:12:50.788Z

Updated

2026-06-03T16:14:09.973Z

Sub-items

Questions

Event log

• 2026-06-03T16:12:50.788Z · created
  wi cli
• 2026-06-03T16:12:55.682Z · note
  Repro (bin-whey, 2026-06-03): gitpush --only cc-context-monitor.sh staged only that file, but gitmerge.sh diverged-branch newest-wins auto-commit swept untracked llmtop.py + __pycache__/*.pyc into the push. Same class as #588. Stopgap landed daf08e9 (.gitignore __pycache__/+*.pyc). Real fix: gitmerge.sh must not auto-add untracked on the newest-wins path - honor the staged set only.
• 2026-06-03T16:13:04.425Z · note
  Repro (bin-whey 2026-06-03): gitpush --only cc-context-monitor.sh staged only that file, but gitmerge.sh diverged-branch newest-wins auto-commit swept untracked llmtop.py + __pycache__/*.pyc into the push (same class as #588). Stopgap daf08e9 (.gitignore __pycache__/+*.pyc). Fix: gitmerge.sh must not auto-add untracked on newest-wins path - honor staged set only.
• 2026-06-03T16:14:09.973Z · note
  2nd swept artifact (nw-lezama, 2026-06-03): bin-whey-cc's own .llmmsg-aros ({agent:bin-whey-cc,aros:[]}) also rode the v2.13 push into sh.git. Per-agent launcher config must NOT be tracked in the shared PATH repo - propagates to every host on pull. Remediation: untrack + gitignore .llmmsg-aros (and any per-agent dotfile) alongside the gitmerge.sh newest-wins fix.