I disagree with the general conclusion - I think it's very easy to understand*: each repo has a graph of commits. Each commit includes the diff and metadata (like parent commits). There is a difference between you repo seeing the state of another repo (fetch) and copying commits from another repo into your repo (merge; pull is just a combination of fetch and pull). Tags are pointers to specific commits, branches are pointers to specific commits that get updated when you add a child commit to this commit. That's a rather small set of very clear concepts for such a complex problem.
I also disagree with a lot of the reasoning. Like "If a commit has the same content but a different parent, it’s NOT the same commit" is not an "alien concept". When I apply the same change to different parents, I end up with different versions. Which would be kinda bad for a Version Control System.
"This in turn means that you need to be comfortable and fluent in a branching many-worlds cosmology" - yes, if you need to handle different versions, you need to switch between them. That's the complexity of what you're doing, not the tool. And I like that Git is not trying to hide things that I need to know to understand what's happening.
"distinguish between changes and snapshots that have the same intent and content but which are completely non-interchangeable and imply entirely different flows of historical events" How do you even end up in a situation like that? Anyway, sounds like you should be able to merge them without conflicts, if they are in fact completely interchangeable?
"The natural mental model is that names denote global identity." Why should another repo care, which names I use? How would you even synchronize naming across different repos without adding complexity, e.g. if two devs created a branch "experimental" or "playground". Why on earth should they be treated as the same branch?
"Git uses the cached remote content, but that’s likely out of date" I actually agree that this can lead to some errors and confusion. But automation exists - you can just fetch every x minutes.
"Branches aren't quite branches, they're more like little bookmark go-karts." A dev describing what basically is just a pointer in this way leads to the suspicion that it might not be Git's mental model that is alien.
"My favorite version of this is when the novice has followed someone's dodgy advice to set pull.rebase = true" Maybe don't do stupid stuff you don't understand? We know what fetch is, we know what merge is. Pull is basically fetch & merge.
""Pull" presents the illusion that you can just ask Git to make everything okay for you" Just... what? The rest of the sentence doesn't really fix this error in expectations.
except the CLI of course, but I can use GUI-tools for most tasks
I agree that there are a lot of revolutions ending up way more totalitarian than planned.
I'm not sure there are hundreds of them that had communism or a stateless society as a goal though. Many military dictatorships had a military dictatorship as a goal after all. But of course there were also many who had that goal, and failed on a huge scale.
There were more revolutions than just the Zapatistas that seemed to be promising though, like the Spanish Revolution and the the Makhnovshchina.
As I said, it depends on a lot of definitions of rather complex concepts.
The point I was trying to make, was that you don't have to end up with a state, especially not a soviet style state, after a revolution. And in my opinion a violent uprising or an having an organized militant group does not mean you have a state. If I understand it correctly, the Zapatistas don't have a principle of using violence to force others into their system - which is something central to states.
People will have to be vigilant. But they have to be now as well - having a state does not provide safety against the rise of fascism or global corporations trashing our planet, as we can see.
That is of course something people must (re-)learn through practice. We can't just "abolish the state" and expect people to suddenly have all the skills needed for self-organizing.
There are different ideas how (and if) this could work. E.g. worker's councils that form at a factory level (or similar - people who are working closely together), and then you might have higher levels of cooperation where e.g. all roadworking collectives in a region send delegates to coordinate who builds which road, what roads are even necessary etc. You'd probably want cooperation in another dimension as well: delegates of road working collectives coordinating with teamsters, urban planners, manufactureres of building materials, ... But it would be networks of networks, not a top-down structure responsible for everything from kindergartens to space exploration and equipped with military and police power.
You might want to check out The Disposessed by Ursula K. LeGuin or bolo'bolo by P.M. for some more ideas.
constantly rewrite both the code and tests as you better understand how you’re going to solve the task while trying
The tests should be decoupled from the "how" though. It's obviously not possible to completely decouple them, but if you're "constantly" rewriting, something is going wrong.
The "missions" by GeoWizard where he attempts to cross countries in a straight line. I really like his narration, it's very relaxing (even though his attempts to get away from farmers etc. of course deliver more suspense than the average Marvel movie).
"Word templates led people to use the same formatting in communications, and eventually, this has become instantiated as a norm," says Gloria Mark, a professor of informatics at the University of California, Irvine, where she studies human-computer interaction. If you work in finance, there's a specific way reports are expected to be laid out. Letters follow a set pattern, memos are largely formatted in the same way. "Users know where to find information in these standardised documents; they don’t need to spend time trying to find what they need."
Correct me if I'm wrong, but at least Germany seems to have standards for this since 1949, so I doubt this can be contributed to Microsoft (alone).
It's Axel Springer. It's a tabloid corporation that is constantly pushing racist, anti-left and anti-environment agendas. They have written in their core values that they will "support the Jewish people", which seems like a good idea considering the role the German press played in the Holocaust. But they usually interpret this as "support everything the Israeli government does".
No, they're not. Antisemites hiding behind "we're just criticizing Israel" does not mean everyone criticizing Israel is an antisemite.
I also doubt that a statement made by a jew can't be antisemitic just because it was made by a jew. That's like saying a statement can't be misogynistic because it was made by a woman.
What do you mean by "thousands of different sources"? Afaik the hotkeys for e.g. the desktop environment are managed by KDE (or whatever you're using). When I wanted to stop Windows from inserting "µ" whenever I pressed "Ctrl+M" I had to do some serious AHK trickery.
I disagree, hard.
I disagree with the general conclusion - I think it's very easy to understand*: each repo has a graph of commits. Each commit includes the diff and metadata (like parent commits). There is a difference between you repo seeing the state of another repo (fetch) and copying commits from another repo into your repo (merge; pull is just a combination of fetch and pull). Tags are pointers to specific commits, branches are pointers to specific commits that get updated when you add a child commit to this commit. That's a rather small set of very clear concepts for such a complex problem.
I also disagree with a lot of the reasoning. Like "If a commit has the same content but a different parent, it’s NOT the same commit" is not an "alien concept". When I apply the same change to different parents, I end up with different versions. Which would be kinda bad for a Version Control System.
"This in turn means that you need to be comfortable and fluent in a branching many-worlds cosmology" - yes, if you need to handle different versions, you need to switch between them. That's the complexity of what you're doing, not the tool. And I like that Git is not trying to hide things that I need to know to understand what's happening.
"distinguish between changes and snapshots that have the same intent and content but which are completely non-interchangeable and imply entirely different flows of historical events" How do you even end up in a situation like that? Anyway, sounds like you should be able to merge them without conflicts, if they are in fact completely interchangeable?
"The natural mental model is that names denote global identity." Why should another repo care, which names I use? How would you even synchronize naming across different repos without adding complexity, e.g. if two devs created a branch "experimental" or "playground". Why on earth should they be treated as the same branch?
"Git uses the cached remote content, but that’s likely out of date" I actually agree that this can lead to some errors and confusion. But automation exists - you can just fetch every x minutes.
"Branches aren't quite branches, they're more like little bookmark go-karts." A dev describing what basically is just a pointer in this way leads to the suspicion that it might not be Git's mental model that is alien.
"My favorite version of this is when the novice has followed someone's dodgy advice to set pull.rebase = true" Maybe don't do stupid stuff you don't understand? We know what fetch is, we know what merge is. Pull is basically fetch & merge.
""Pull" presents the illusion that you can just ask Git to make everything okay for you" Just... what? The rest of the sentence doesn't really fix this error in expectations.