merge and reset: adjust for "reset --hard" messages