I lost a week's worth of work due a git conflict, please kill me now.

That sucks majorly. I would suggest checking in your work frequently - so that you don't go off in some different direction from development. It's happened to me before - not with git but just working on shared files with a bunch of other dudes.

how did it happen?

@thebiochemic source tree was in the middle of "reconstructing" the project or whatever it means. I thought: " I'm gonna stop it and commit for the day", but for whatever reason it resettled the project to a week's ago state. I forgot to commit too many days in a row (ADHD is a btch) and the rest is history.

@ookami okay, i already suspected something like that.
As hard as it sounds, but that one's on you.

@thebiochemic yeah I know. My ignorance played me.

@ookami hey, see it as a learning experience. Next time you'll remember to commit properly (hopefully).

as long as you have commited any earlier useful state, check your reflog.

Also check your text editor's cache

Don't know how a commit operation can cause any conflict if no pull is involved...

@ookami Are you using a jetbrains ide? They have a local history. Saved me a couple of times so far..

@SuspiciousBug does xcode have one too? Else no :(

In fact, a commit can *never* cause a conflict.

So firsts it's a conflicts fault (just about impossible). Then it's basically ADHD.
Look I don't have it so I can't fully understand it but it sounds a bit like an excuse for a simple fuckup to me. You don't need to commit every day however structured habits often do help people with ADHD.

If you can write code and can test the code then you can also commit the code. As soon as you have a working piece of code or finished unit or work you commit. Perhaps it helps if you can only test remotely so you have to commit and push your feature branch in order to see if it works.

Anyway even with a condition it should not be that hard. Stop blaming things, start owning and adapting.