curious about something. wanna see how big the #GameDev community on mastodon is. are you a game developer?
@eniko I've dabbled occasionally but I don't feel it's enough to apply the label even of hobbyist but I'm at least some kinda gamedev so I picked "something else".
how git cherry-pick and revert use 3-way merge https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/
The Fedi Meta, TBS, Blocklists, Everything Summarized
I've written out a very, very long blog post intended to be both a refresher for anyone who hasn't been following all this shit and as my side of the story for some of the more contentious elements, and I encourage anyone who cares about this kind of stuff to give it a read when they can: https://blog.silvereagle.dev/d/3z9flj7l49
A growing number of reports indicate #Israeli forces responsible for Israeli civilian and military deaths following October 7 attack.
Many details of what transpired on October 7 continue to be shrouded in mystery, including how the 1,400 Israelis who died were killed. A growing number of reports indicate the Israeli military was responsible for civilian and military deaths.
@draknek It's good to have a system, I think, and then completely ignore the system when you wanna do something else.
@b0rk A sort of work-around for the git commit --amend/git rebase --continue confusion is to always use git add followed by git rebase --continue. Those steps do the right thing whether you're resolving a conflict or editing a commit.
@lioness But she already lives there and we don't need another one.
@zigg Headspace is an imaginary location that we use to observe and interact with headmates. Ours was intentionally created, but it has its own sun with a time-of-day cycle, which we didn't put there on purpose, and which seems to vaguely correspond with our schedule (sunrise at approximately our normal wakeup time, sunset at approximately bedtime). We don't actually look at the headspace sun, we just kinda sense where it is?
@zigg We can track our circadian rhythm by the position of the sun in headspace, and lately it's been drifting earlier, which had confused us but maybe it was in anticipation?
Now I'm wondering if it works in the other direction, can I imagine the headspace sun somewhere else and change my circadian rhythm that way? Feels unlikely but you never know.
Anyway, we seem to be doing OK with the adjustment so far.