Online marketplace

Multi-user:
* <TV Tropes>
* <WikiWikiWeb>

Personal: <the best personal webpages of all time>{full}.


The best websites of all time

{c}
{title2=1488-?}
{wiki}

= 謝時臣
{synonym}
{title2}


Xie Shichen

{tag=Yet another}

https://xkcd.com/927/

\Image[https://web.archive.org/web/20220108012523im_/https://imgs.xkcd.com/comics/standards.png]


xkcd 927: Standards

Differential equation

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.


Linear history vs branching

Git tips <span class="meta">/</span> Linear history vs branching

{tag=Evil}
{wiki}

Just use <limit (mathematics)> instead, please. The <French> are particularly guilty of this.


Infinitesimal

{disambiguate=mathematics}
{wiki}

= Limit
{synonym}

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.


Limit

Limit (mathematics)

Reproduction

Good book

Howard Hughes Medical Institute

List of board games

{wiki=Medical_Research_Council_(United_Kingdom)}

= MRC
{c}
{synonym}
{title2}


Medical Research Council

{c}
{wiki}

= Walter and Eliza Hall Institute of Medical Research
{c}
{synonym}
{title2}

Poor renaming choice.


WEHI

WordPress

{tag=Horizontal gene transfer}
{title2=bacterial sex}
{wiki}

Pseudo-<fuck>.


Bacterial conjugation

{tag=Evil}

= Idiotic Stack Overflow policies
{synonym}


Bad Stack Overflow policies

The key to solve conflicts is:
> You have to understand what are the two commits that touched a given line (one from master, one from features), and then combine them somehow.

Or in other words, at every rebase conflict we have something like:
``
master-commit    feature-commit
|                |
|                |
base-commit------+
|
|
``
Therefore there are 2 diffs that you have to understand and reconcile:
* `base-commit` to `master-commit`
* `base-commit` to `feature-commit`


Ciro Santilli @cirosantilli 40