Sub-ticket of MSG-216 gitmerge.sh newest-wins: discarded merge rc (:311) lets a non-merge commit the staged index and report 'Merge complete' · llmmsg-srv