removing --hard from the reset so it defaults to --mixed, to see if this solves the problem with not being able to commit