Not everyone wants Git to do merges. Suppose you have made one or two new commits, which we'll call I and J, and your git fetch from origin brings in two new commits that they made since you started, which we will call K and L. That gives you a set of commits that, if you were to draw them, might look like this:
I--J <-- your-branch
/
...--G--H <-- main
K--L <-- origin/main
You can fast-forward your main to match their origin/main:
After Joel Morris's fake whiteboard being taken as real on here, how about we post our own (real) odd whiteboard diagrams that made sense at the time. Here's one of mine from 2008.
so, this would basically make me able to say that someone who claims is me but is not actually me is not me?
like this?
this pal says they're me but that's a lie: <a rel="notme" href="https://liarswebsite.com/">Liar</a>.
Monospace fonts are dear to many of us. Some find them more readable, consistent, and beautiful, than their proportional alternatives. Maybe we're just brainwashed from spending years in the terminal? Or are we hopelessly nostalgic? I'm not sure. But I like them, and that's why I started experimenting with all-monospace Web.
I am now certain one can make horror out of anything, notably chicken batteries. I learnt the word „vestigial“. cyborgs are not what I expected them to be.
This is the Marigold Town Free School, please make yourselves at home. This page serves as the introduction to the concept and has a little bit of background about this specific free school!
I feel like I am always focused on one specific thing, thinking about one specific thing or able to work on one specific thing. interacting with my Zettelkasten is what makes me feel the most connected to myself: doing so makes me somewhat conscious of everything I do and am.
waouh. je n'aurais jamais imaginé une vidéo comme ça sur l'internet francophone, à propos d'un film que j'ai vu mais complètement oublié, basé sur le livre que je suis actuellement en train de lire. avec une outro qui fait référence à Gorillaz. incroyable.
there is a very large quantity of widely dispersed gods and you don't know about the vast majority of them
there are quite a few gods, but a bounded amount
there is exactly one god
there are exactly zero gods
By extrapolation, we can conclude that the next step is that humanity has negative one god, i.e. is in theological debt and must build a god to continue. This is where the EY-style "aligned singleton" came from. But people are now moving toward "we need everyone to have pocket gods" because they are insane, in line with the pattern. The next step is of course "we need to build gods and put them in everything".
I have once again failed at managing my time; now, I am in a rush to accomplish what I could easily have done during those time spent by mindlessly scrolling.
I hate myself. my self-hatred is too much recurrent.
this is a gouache painting. the wolf-like character in the middle is stolen from inspired by Hundun from the 有兽焉 manhua. the bird-like ones around are completely unrelated; they are somewhat inspired by Julia Soboleva's paintings.
I have a Zettelkasten. in its §2025-01-08 14:04 entry, I have written the following:
society's specialisation, programming's separation of concerns linguistic isolativeness, and personal knowledge management's atomiticity are different concepts regarding one thing: having each member of a system have the smallest possible quantity of functions so that it can be as reused as possible.
something I like about analog is that if my desk gets messy, I cannot ignore it; I have to do something about it. this is something that never happens with virtual interfaces because of the lack of disgust or physical limitation in those shiny and ageless icons.