Home merge

One can consider the practice described in order to avoid trivial merges as a natural increment over the wisdom slowly gained in SCM history, and which led to the concept of back merge (unfortunate terminological clash: inversion of back and forward!) or rebase.

The ultimate (and so far missing) addition is that there is no real good reason to ever do a delivery merge (which cannot reasonably be called forward).
This leaves a single remaining merge pattern, which we should better term the home merge.

-- MarcGirod - 12 Sep 2005