hailey
i have no idea how i even got into this state though!! absolutely bizarre...xcode does some weird stuff with "groups" not always being "directories" though so i suspect that is part of it.
2 7
xormetric
yeah this is usually the point i'd reset --hard back a few commits to get into a good state and copy the new code back in manually lol maybe something like git mv Aa/* AA/ would work tho since git is for sure case sensitive
1 3
hailey
i got out of it by just deleting all those directories from xcode, commiting the deletions, then adding the files back manually... i was commiting all day in this borked state and didnt even realize lol
3 6
Carl Vitullo
Yup I was checking the comments to make sure you'd gotten it, I've hit this before and it's MADDENING. Recognized it immediately from your description, it stuck with me
2 3
Carl Vitullo
Deleting, committing, undeleting, committing, is also the only fix I'm aware of (but iirc you can squash the commits away and it works fine after)
3
hailey
absolutely wild! the fact i couldnt even discard the changes to switch off of the branch was the icing on top of the whole thing....
1 2
hailey
LOL for real. not in a long time have i had that sinking "im really scared of git right now" feeling than i did today.
2
Jeff Hamilton
we had a weird bug on city of heroes where some dev environments had different capitalization which, to the client's patcher, would signify that the file needed to be redownloaded. So for years some players would randomly get multi-gig patches based on which dev did the last checkin on a patch
1 2
Warcabbit
Parenthetic note: at City of Titans, we fixed that by cross-compiling to Mac and Linux which screams about capitalization. The first time through, that was a _trip_. Found problems with Unreal itself, had to feed them back in.
1
Kuba Suder 🇵🇱🇺🇦
Oof… sounds like not fun. Generally filesystems on the Mac are case-insensitive by default, and funny things might happen if you try to have two files with the "same" name… I'd try to use the terminal to rename one of those so they're seen as different names.
1 1
hailey
the weird thing is the one that is `Hls` doesn't even show up in the file system!
1 1
Natanael, Tech janitor
Did you end up with some very weird indirections stuck in various places? Try the renaming thing anyway, and try it twice in a row even with different target names just to see what happens. Might get something unstuck?
1 1
hailey
IIRC i tried renaming, though didn't try multiple times, heh. solution for me was to rm the whole directory and pull it back down
2
Autumn
Really love the story that materialized with those commit messages there
1