James58899
says to
Ow< [MSFW]
fatal: cannot do a partial commit during a merge.