basquetWi + New ticket

New ticket

Sub-ticket of MSG-216 gitmerge.sh diverged-branch newest-wins auto-adds untracked files, defeats gitpush --only strict-staging · llmmsg-srv