issue "git commit -a -C ID" instead of "git commit -C ID" on conflicts/errors