In order to solve conflicts, you just have to understand what commit you are trying to move where.

E.g. if from:we do:what happens step by step is first 6 is moved on top of 5:and then 7 is moved on top of the new 6:

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

Other examples include:

That example calculates and displays the final widths via JavaScript, making it easier to understand the calculations being done.

Answers: stackoverflow.com/questions/28473807/how-does-flex-grow0-get-interpreted/69995712#69995712

Bibliography:

This shows how to produce a minimized fully embedded CSS file with webpack from a sass:That example produces a dist/main.css file which is a compresesd combination of:

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.

A bit like a cult.

Many speakers are good. But especially in TEDx, we've had some notorious ones:

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: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:

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: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.

Good Portuguese overview: www.scielo.br/scielo.php?script=sci_arttext&pid=S1806-11172017000300301&lng=pt&tlng=pt

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.

Nice, nice place. Natural sciences only, no bullshit.