Resolving my #git problems via the tried-and-trusted means of nuking the fucking directory, and starting over