@b0rk I work with submodules a lot and unfortunately "git submodule update" leaves the submodules in detached head state, so it's common for me to not be on a branch.
@b0rk typically I do something like:
git branch -f main # only if I wasn't on a branch
gitk # to make sure I'm pushing only the commits I intend
git push origin main
@b0rk I didn't know "git push" cared about the current branch at all. I always specified a branch to push, which works fine in "detached head state". I never use "git pull" (combining the "fetch" and "merge" steps into one makes me feel unsure about what's going to happen) so I don't know if it's similar.
I really dislike the common line of reasoning that "being gay/trans isn't wrong because they were born this way/it's not a choice". That's not why it isn't wrong. It isn't wrong because it doesn't cause any harm to anyone. If being gay was a choice it'd be just as okay morally!
This is important because sexual attraction and gender identity can naturally change over the course of one's life. Under the framework of "it's only ok if they're born like this" that can be seen as problematic. It forces people to stay quiet about their experiences if their identity changes at all and especially if some external factor was a catalyst for that. And so what if it was? What if some experience "made you bi"? There's still nothing wrong with that!
When the invasion from the fourth dimension came, it had unexpected benefits. The new overlords were surprisingly mild. They only wanted the Earth for Qling, a substance we neither understood nor needed. They filled enormous eye-warping four dimensional tankers with a cargo we couldn’t even perceive, then left us in peace. A few stayed, having found human friends and even lovers.
My neighbour is one such. We met when xe returned my lost cat. “I don’t know how she keeps getting out”, I said, “all the doors and windows are shut”.
“What about that gap there?”
“Where?”
“Oh of course, it’s invisible in three dimensions. Here let me close it up.”
The cat is still furious about this.
streaming
https://twitch.tv/madewokherd Continuing the attempts to get better at playing BIT.TRIP Runner with my feet. Also updated the spaced repetition system to choose pars more aggressively and lower cooldowns when I repeatedly fail.
streaming
https://twitch.tv/madewokherd Chill puzzle time! At least I hope so. Trying out Inhabit.
@hellomiakoda @punishmenthurts @haui @theautisticcoach @actuallyautistic my intuition is that a lot of NT "communication" comes down to both people nodding in agreement about something but if you ask them seperately they actually don't even agree.
We are bad at communicating because they follow rules that make things easier for them, not more accurate or precise, just easier for them.
By insisting on the necessary relevance of the specific information you fail the NT nod along test, you make it "difficult" by refusing to make collective the sense of ease the primary goal.
That's why we are so "difficult" maybe idk
"Drop" is probably the most useful concept that I don't think is widely understood outside the kink community but applies to SO MUCH STUFF in everyday life.
Drop is the shitty feeling you get after an intense experience (including an intense positive experience). It's sometimes immediate, but sometimes the day after or some other time. "Post-con depression" is a form of drop. In the kink community, we try really hard to stop drop from happening with aftercare, but outside of the scene you don't often get the chance to build in aftercare to intense experiences.
Different people find different things helpful for dealing with it. Rest is generally good, as is doing things you like, sugary foods, and recognising that you are in drop and not putting too much pressure on yourself.
allowing yourself to do what you need to get through drop is crucial (imo) to allowing positive experiences to stay positive, and to deal with the emotional effects of negative ones.
@recursive Dunno, first I've heard of it. But security is the primary reason I hear why people "should" use ad blockers - for most users the vast majority of attacks through the web (both malware and scams) will come in through ad networks.
Autistic peer-to-peer information transfer is highly effective:
"... information transfer between autistic people may be more successful than information transfer between an autistic and a non-autistic person. ... autistic people effectively share information with each other. Information transfer selectively degrades more quickly in mixed pairs, in parallel with a reduction in rapport."
https://journals.sagepub.com/doi/full/10.1177/1362361320919286
@Frances_Larina @magicalgrrrl @actuallyautistic And I think the way that happened for me was by pursuing specific interests that bring in both kinds of folks. But since that depends on what your particular interests are, it doesn't really work as advice. -Cole
@Frances_Larina @magicalgrrrl @actuallyautistic This might explain a lot about why my experiences of queer communities so often differ from others I hear about. I think I tend to end up in communities where ND folks and queer folks congregate, even though they're not necessarily explicitly either. -Cole
@magicalgrrrl @actuallyautistic
It's been my experience that I am mostly welcome in the corners of the queer world that are ND. The rest of it seems very NT oriented & centric. That's okay, it just mimics the straight world. But it's important to keep in mind when seeking out friendships.
@Frances_Larina @magicalgrrrl @actuallyautistic And I think the way that happened for me was by pursuing specific interests that bring in both kinds of folks. But since that depends on what your particular interests are, it doesn't really work as advice. -Cole
@Frances_Larina @magicalgrrrl @actuallyautistic This might explain a lot about why my experiences of queer communities so often differ from others I hear about. I think I tend to end up in communities where ND folks and queer folks congregate, even though they're not necessarily explicitly either. -Cole
streaming
https://twitch.tv/madewokherd Playing BIT.TRIP Runner still.
@parvXtl @b0rk The merge base is the most recent commit that's in the history of the commits you're merging together. You can think of it as the point where the history first diverged.
https://wizardzines.com/comics/meet-the-merge/ is a good illustration of why it's useful to be able to see it (it's labeled "original" there).