Lovely people, I have been tied in knots by unwittingly tying our Git in knots. I decided that the best way to fix things was to follow the “Reset Dev Environment to Live” section of this page:
It seems to have worked for Dev, but Test still has all the old, borked stuff in it. (Test is as far as it went - it never made it to live.) Do I worry about this? Ignore it?