In order to solve conflicts, you just have to understand what commit you are trying to move where.
E.g. if from:
5 master
|
4 7 my-feature HEAD
| |
3 6
|/
2
|
1
we do:
git rebase master
what happens step by step is first 6 is moved on top of 5:
6on5 HEAD
|
5 master
|
4                 7 my-feature
|                 |
3                 6
|                 |
2-----------------+
|
1
and then 7 is moved on top of the new 6:
7on5 HEAD
|
6on5
|
5 master
|
4                 7 my-feature
|                 |
3                 6
|                 |
2-----------------+
|
1
All good? so OK, let's move the my-feature to the new 7:
7on5 my-feature HEAD
|
6on5
|
5 master
|
4
|
3
|
2
|
1
git rebase does not tell you that, and that sucks.
We only know which commit from the feature branch caused the problem.
Generally we can guess or it is not needed, but imerge does look promising: stackoverflow.com/questions/18162930/how-can-i-find-out-which-git-commits-cause-conflicts
CSS flex by Ciro Santilli 40 Updated 2025-07-16
  • css/flex.html: illustrates basic flex usage, including:
  • flex-grow: if there's space left, this determines how much extra space will be given to each.
  • flex-basis: the size the items want to be. But if there isnt' enough space, this can be cut up.
    Note that the minimal space required by children of the flex children cannot be necessarily cut up, and might lead things to overflow out of the container.
  • flex-shrink: if there's space missing, this determines how much extra space will be removed from each flex-basis
Other examples include:
That example calculates and displays the final widths via JavaScript, making it easier to understand the calculations being done.
webpack Sass import by Ciro Santilli 40 Updated 2025-07-16
This shows how to produce a minimized fully embedded CSS file with webpack from a sass:
cd webpack/sass
npm install
npm run build
xdg-open index.html
That example produces a dist/main.css file which is a compresesd combination of:
Chromium (web browser) by Ciro Santilli 40 Updated 2025-07-16
Google is trying to kill it as of 2021: www.omgubuntu.co.uk/2021/01/chromium-sync-google-api-removed The lack of sync is a major major blow. So selfish. Google makes billions, and it won't give in a little bit of settings storage...
The channel is also notable for the fact that the author makes his own music.
Video 1.
Behind the Scenes by Sci-Inspi (2020)
Source. His name is Manuael, aka Manu, and he is the chemistry lab technician at a community college.
TED (conference) by Ciro Santilli 40 Updated 2025-07-16
A bit like a cult.
Many speakers are good. But especially in TEDx, we've had some notorious ones:
Education is broken by Ciro Santilli 40 Updated 2026-01-30
Once Ciro was at a University course practical session, and a graduate was around helping out. Ciro asked if what the graduate did anything specifically related to the course, and they replied they didn't. And they added that:
One has to put the bread on the table.
Even though Ciro was already completely disillusioned by then, that still made an impression on him. Something is really wrong with this shit.
Other people that think that the educational system is currently bullshit as of 2020:
Video 1.
The problem with education by Ciro Santilli
. Source. In this video Ciro Santilli exposes his fundamental philosophy regarding why Education is broken. This philosophy was the key motivation behind the failed OurBigBook Project.
Video 2.
The foolishness of that comment is so deep, I could only ascribe it to higher education
. Source. From some interview with Dennis Prager, American conservative radio talk show host. First or early Thug life meme according to knowyourmeme.com/memes/thug-life. TODO find full interview.
Video 3.
Peter Gregory from Silicon Valley shows his hate for university in a fake TED talk
. Source. Key moment: someone from the crowd cries:
The true value of a college education is intangible!
to which the speaker replies:
The true value of snake oil is intangible as well.
IMDb says it's not a cameo. It really looked like one, good acting, but what a missed opportunity. Imagine a Xavier Niel appearance.
Video 4.
David Deutsch on Education interviewed by Aidan McCullen (2019)
Source.
Key quote that hits the nail:
[...] the existing assumptions behind educational systems are that the purpose of education is to transmit valuable knowledge faithfully from on generation to the next. From people who already have that knowledge, to people who don't.
So the knowledge is conceived of as a kind of valuable fluid, which you pour from one generation to the next, pour it into their brains.
So right... the purpose of education is not to teach facts. The purpose of education is to propose ways of thinking, which students themselves must try to apply and decide if it suits them! And use the patterns of thinking that are useful to reach their goals.
Like Noam Chomsky, he proposes education has been a system of indoctrination more than anything else e.g. twitter.com/daviddeutschoxf/status/1406374921748496386:
All compulsory education, "tough" or not, "love" or not, in camps or not, and whether it "traumatises" or not, is a violation of human rights.
At twitter.com/DavidDeutschOxf/status/1051475227476185089 another good quote by Churchill:
Headmasters have powers at their disposal with which Prime Ministers have never yet been invested.
The same video also mentions in passing that john Wheeler used to be Deutsch's boss, but I can't find a reference for it very easily.
Video 5.
Quote selection by Charles Bukowski (2016)
Source.
Generally speaking, you're free until you're about 4 years old. Then you go to grammar school and then you start becoming... oriented and shoved into areas. You lose what individualism you have, if you have enough of course, you retain some of it... Then you work the 8 hour job with almost a feeling of goodness, like you're doing something. Then you get married like marriage is a victory, and you have children like children is a victory... Marriage, birth, children. It's something they have to do because there's nothing else to do. There's no glory in it, there's no steam, there's no fire. It's very, very flat... You get caught into the stricture of what you're supposed to be and you have no other choice. You're finally molded and melded into what you're supposed to be. I didn't like this.
Video 7.
I "Crashed Out" After Studying Physics In College by Alex Wei
. Source. A large part of his problem are High expectations Asian father issues. But society does absolutely nothing to help either, treating Education as an IQ test.
Video 8.
The decline of play by Peter Gray TEDxNavesink talk
. Source.
Video 9.
Can you get an MIT education for $2,000? by Scott Young
. Source.
Video 10.
Graduating from Chinese College by Arcnimation
. Source.
42 (school) by Ciro Santilli 40 Updated 2025-07-16
No teachers, no courses, no tuition fees. Yes please!!! By Xavier Niel.
The image of an university is basically their only real asset, which they extract money out of via undergraduate students in some countries like the USA, and by getting funding.
For this reason, universities will sacrifice basically any principle in order to give themselves a good image.
Although for profit companies also do this, it is simply on another level for universities.
As of 2020s and much earlier, Ciro Santilli believes that undergrad studies were fundamentally broken (considering the Information Age which completely changed what would be possible) because university had only two goals, with the exception of a few enlightened professors:
  • rank students from worse to best so they can get into PhD programs.
    For regular jobs grades didn't even matter as much compared the prestige of your university (and therefore, university entry exam grades) and your ability to stand the stress of exams to get minimal passing grade.
    In particular, being able to rank requires setting the difficulty level at a point where you can see a normal distribution in grades, and not have everyone at either 0 nor 100%.
    Also, this split could be caused by either shitty learning materials/conditions, or by mere volume. It doesn't matter.
  • get money from the students. Of course, in countries where university is "free", this means reporting how many students you had to some government office so they can give you a corresponding budget. But you still have an incentive to enroll as many as possible.
As a result, most students, who would not go on to do a PhD essentially do a simple trade: all their time, and possibly some money, in exchange for imbuing themselves with the incredible name of a respected institution so they can get better jobs later on.
Beauty, deep understanding, and learning awesome things comes basically as a second thought.
A fantastic sounding full time 4-year course that any student could transfer to called that teaches various natural science topics, notably mathematics, physics, chemistry and molecular biology.
Many past students Ciro talked to however share a common frustration with the course: in the first 2 years at least, the "basic cycle", you have infinitely many courses, and no time to study, and no choice of what to study, it is only in the latter 2 years (the advanced cycle) that you get the choices.
Also, if you get low grades in a single subject, your out. And exams are useless of course.
Here's a Quora question in Portuguese about the course: pt.quora.com/Como-funciona-o-tal-do-curso-secreto-da-USP, the only decent answer so far being: pt.quora.com/Como-funciona-o-tal-do-curso-secreto-da-USP/answer/Victor-Soares-31. Very disappointing to hear.
On the advanced cycle, you have a lot of academic freedom. You are basically supposed to pick a research project with an advisor and go for it, with a small amount of mandatory course hours. Ciro was told in 2022 that you can even have advisors from other universities or industry, and that it is perfectly feasible to take courses in another university and validate the course hours later on. Fantastic!!!
Students from the entire University of São Paulo can apply to transfer to it only after joining the university, with the guarantee that they can go back to their original courses if they don't adapt to the new course, which is great!
Not doing it is one of Ciro Santilli's regrets in life, see also: don't be a pussy.
Around 2007, they were in a really shady building of the University, but when Ciro checked in 2021, they had apparently moved to a shiny new entrepreneurship-focused building. Fantastic news!!!
This place has one of the best changes of spawning the first Brazilian Nobel Prize or unicorn.
One of the Brazilians who came to École Polytechnique together with Ciro was from this course. The fact that he is one of the most intelligent people Ciro knows gave further credit to that course in his eyes.

Pinned article: Introduction to the OurBigBook Project

Welcome to the OurBigBook Project! Our goal is to create the perfect publishing platform for STEM subjects, and get university-level students to write the best free STEM tutorials ever.
Everyone is welcome to create an account and play with the site: ourbigbook.com/go/register. We belive that students themselves can write amazing tutorials, but teachers are welcome too. You can write about anything you want, it doesn't have to be STEM or even educational. Silly test content is very welcome and you won't be penalized in any way. Just keep it legal!
We have two killer features:
  1. topics: topics group articles by different users with the same title, e.g. here is the topic for the "Fundamental Theorem of Calculus" ourbigbook.com/go/topic/fundamental-theorem-of-calculus
    Articles of different users are sorted by upvote within each article page. This feature is a bit like:
    • a Wikipedia where each user can have their own version of each article
    • a Q&A website like Stack Overflow, where multiple people can give their views on a given topic, and the best ones are sorted by upvote. Except you don't need to wait for someone to ask first, and any topic goes, no matter how narrow or broad
    This feature makes it possible for readers to find better explanations of any topic created by other writers. And it allows writers to create an explanation in a place that readers might actually find it.
    Figure 1.
    Screenshot of the "Derivative" topic page
    . View it live at: ourbigbook.com/go/topic/derivative
  2. local editing: you can store all your personal knowledge base content locally in a plaintext markup format that can be edited locally and published either:
    This way you can be sure that even if OurBigBook.com were to go down one day (which we have no plans to do as it is quite cheap to host!), your content will still be perfectly readable as a static site.
    Figure 2.
    You can publish local OurBigBook lightweight markup files to either https://OurBigBook.com or as a static website
    .
    Figure 3.
    Visual Studio Code extension installation
    .
    Figure 4.
    Visual Studio Code extension tree navigation
    .
    Figure 5.
    Web editor
    . You can also edit articles on the Web editor without installing anything locally.
    Video 3.
    Edit locally and publish demo
    . Source. This shows editing OurBigBook Markup and publishing it using the Visual Studio Code extension.
    Video 4.
    OurBigBook Visual Studio Code extension editing and navigation demo
    . Source.
  3. https://raw.githubusercontent.com/ourbigbook/ourbigbook-media/master/feature/x/hilbert-space-arrow.png
  4. Infinitely deep tables of contents:
    Figure 6.
    Dynamic article tree with infinitely deep table of contents
    .
    Descendant pages can also show up as toplevel e.g.: ourbigbook.com/cirosantilli/chordate-subclade
All our software is open source and hosted at: github.com/ourbigbook/ourbigbook
Further documentation can be found at: docs.ourbigbook.com
Feel free to reach our to us for any help or suggestions: docs.ourbigbook.com/#contact