git——'fatal: cannot do a partial commit during a merge' Git撤销add、commit