When git goes wrong, you fix.