Ciro Santilli @cirosantilli 37

 Articles (11k) Discussions (26) Comments (64) Follows  Received likes Files

New Updated  Top  Announced  A-Z  Liked  Followed

Online marketplace Updated 2025-07-16

 Read the full article

Review site Updated 2025-07-16

 Read the full article

Git tips / diff3 Updated 2025-07-16

 View more

diff3 conflict is basically what you always want to see, either by setting it as the default as per stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git:

git config --global merge.conflictstyle diff3

or as a one off:

git checkout --conflict=diff3

With this, conflicts now show up as:

++<<<<<<< HEAD
 +5
++||||||| parent of 7b0f59d (6)
++3
++=======
+ 6
++>>>>>>> 7b0f59d (6)

7b0f59d is the SHA-2 of commit 6.

instead of the inferior default:

++<<<<<<< ours
 +5
++=======
+ 6
++>>>>>>> theirs

We can also observe the current tree state during resolution:

* b4ec057 (HEAD, master) 5
* 0b37c1b 4
| * fbfbfe8 (my-feature) 7
| * 7b0f59d 6
|/
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1

so we understand that we are now at 5 and that we are trying to apply our commit 6

So it is much clearer what is happening:

master changed the code from 3 to 5
our feature changed the code from 3 to 6

and so now we have to decide what the new code is that will put both of these together.

Let's say we decide it is 5 + 6 = 11 and continue rebasing:

git add .
git rebase --continue

We now reach:

++<<<<<<< HEAD
 +11
++||||||| parent of fbfbfe8 (7)
++6
++=======
+ 7
++>>>>>>> fbfbfe8 (7)

and the tree looks like:

* ca7f7ff (HEAD) 6
* b4ec057 (master) 5
* 0b37c1b 4
| * fbfbfe8 (my-feature) 7
| * 7b0f59d 6
|/
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1

So we understand that:

after the previous step we added commit 6 on top of 5
now we are adding 7 on top of the new 6 (which we decided would contain 11)

and after resolving that one we now reach:

* e1aaf20 (HEAD -> my-feature) 7
* ca7f7ff 6
* b4ec057 (master) 5
* 0b37c1b 4
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1

 Read the full article

Git tips / It's not a tree, it's actually a DAG Updated 2025-07-16

 View more

Every tree is a directed acyclic graph.

But not every directed acyclic graph is a tree.

Example of a tree (and therefore also a DAG):

5
|
4 7
| |
3 6
|/
2
|
1

Convention in this presentation: arrows implicitly point up, just like in a git log, i.e.:

1 is parent of 2
2 is parent of 3 and 6
3 is parent of 4

and so on.

Example of a DAG that is not a tree:

7
|\
4 6
| |
3 5
|/
2
|
1

This is not a tree because there are two ways to reach 7:

2, 3, 4, 7
2, 5, 6, 7

But we often say "tree" intead of "DAG" in the context of Git because DAG sounds ugly.

Example of a graph that is not a DAG:

6
^
|
3->4
^  |
|  v
2<-5
^
|
1

This one is not acyclic because there is a cycle 2, 3, 4, 5, 2.

 Read the full article

The best websites of all time Updated 2025-07-16

 View more

Multi-user:

Personal: Section "The best personal webpages of all time".

 Read the full article

Chemical element Updated 2025-07-16

 Read the full article

Chemical substance Updated 2025-07-16

 Read the full article

Chemist Updated 2025-07-16

 Read the full article

Differential equation Updated 2025-07-16

 Read the full article

Git tips / Linear history vs branching Updated 2025-07-16

 View more

There are two ways to organize a project:

linear history
branched history: history with merge commits

Some people like merges, but they are ugly and stupid. Rebase instead and keep linear history.

Linear history:

5 master
|
4
|
3
|
2
|
1 first commit

Branched history:

7   master
|\
| \
6  \
|\  \
| |  |
3 4  5
| |  |
| /  /
|/  /
2  /
| /
1/  first commit

Here commits 6 and 7 are the so called "merge commits":

they have multiple parents:
- 6 has parents 3 and 4
- 7 has parents 5 and 6
they are useless and don't contain any real information

Which type of tree do you think will be easier to understand and maintain?

????

????????????

You may disconnect now if you still like branched history.

 Read the full article

Infinitesimal Updated 2025-07-16

 View more

Just use limit instead, please. The French are particularly guilty of this.

 Read the full article

Limit (mathematics) Updated 2025-07-16

 View more

The fundamental concept of calculus!

The reason why the epsilon delta definition is so venerated is that it fits directly into well known methods of the formalization of mathematics, making the notion completely precise.

 Read the full article

Cold Spring Harbor Laboratory Updated 2025-07-16

 View more

A hot hot place.

 Read the full article

Git tips / Oh, but there are 2 trees: local and remote Updated 2025-07-16

 View more

Oh but there are usually 2 trees: local and remote.

So you also have to learn how to observe and modify and sync with the remote tree!

But basically:

git fetch

to update the remote tree. And then you can use it exactly like any other branch, except you prefix them with the remote (usually origin/*), e.g.:

origin/master is the latest fetch of the remote version of master
origin/my-feature is the latest fetch of the remote version of my-feature

 Read the full article

Good book Updated 2025-07-16

 Read the full article

Howard Hughes Medical Institute Updated 2025-07-16

 Read the full article

List of board games Updated 2025-07-16

 Read the full article

Medical Research Council Updated 2025-07-16

 Read the full article

Reproduction Updated 2025-07-16

 Read the full article

WEHI Updated 2025-07-16

 View more

Poor renaming choice.

 Read the full article

 Unlisted articles are being shown, click here to show only listed articles.