I am a game developer who knows game development pretty well for a long time, but I am not the best with other development and computer processes. I have a project I have been developing in Unity for 4 years. I keep that project in version control that I don’t fully understand. But my project is on gitea/synology on a friend’s small constantly running computer with a hard drive or something? It’s his own form of backup.

I use sourcetree to push and pull and it’s just me pushing and pulling except very occasionally my girlfriend also pushes and pulls some things because she very occasionally helps me with vfx. My last push was a month ago which I know is really bad. Plz don’t beat me up for my poor use of source control. That push was on April 11th, and I have done a month of work since then. My girlfriend pushed a small vfx thing. I went to my computer. I staged my month of changes. I clikced commit. I stupidly clicked pull while the commit was happening. I cancelled the pull. I waited a few minutes, the staged and unstaged files looked wrong and I panicked a bit and stupidly clicked pull again. I think because the pull makes a commit, it wiped all of my changes.

I just have a main branch because it’s almost just me using this. Unity was open when this happened (yesterday) so it sort of updated and changed things according to the deleted and changed files. I had a lot of work in my character’s from scratch physics character controller (across mostly 2 scripts) and a bunch of environmental platforming mechanics mostly made up of added files that are now nowehre.

I have read some things that say maybe staged files or sometimes uncommited files are still tracked in git, but I’m not super technically competent to navigate handling this kind of thing. It’s only a month of work, but that’s also worth a couple thousand dollars to me at least, and it’s still a lot of work. I tried hard resetting the head but my changes weren’t there. My staches on sourcetree are empty. My uncommitted changes aren’t represented on my project’s history anywhere in any way. Is there any other way to possibly recover any of these changes? Added files and changed files? Does anyone know something that might be able to help or can anyone point me to something or a service that can possibly help? I once got my whole computer wiped by geek squad’s incompetence and I lost a whole year of work, so I’d prefer working with something I can call rather than sending my computer in if someone suggests a service.

What I’ve already done:
I looked through my history, staches, my main branch, committed changes, file explorer history, unity tools for recovery. I did a “git reset hard” on the last head that had the uncommitted changes and didn’t see my changes there.I am soon going to try what I see here on this. Atlassian has no call support and I’m not sure where to look or what to do. I know for recovering anything temp, the less I do, the more likely my computer hasn’t removed it. I have turned my computer on and off and closed the softwares and reopened them several times (every time you open unity it generates files and does things).

If anyone can help, I would be very appreciative