[cfe-dev] [llvm-dev] [lldb-dev] [GitHub] RFC: Enforcing no merge commit policy

[Andrea Bocci via cfe-dev]

On Thu, 21 Mar 2019 at 16:34, Artem Dergachev via cfe-dev <
cfe-dev at lists.llvm.org> wrote:

> If you're doing merge commits, you might lose linear history, but you
> obtain another fancy invariant: every piece of work - i.e., every patch,
> every merge conflict resolution - appears in the repository exactly
> once, under a unique identifier, and the non-linear source control
> history becomes an accurate representation of the real history of
> development.
>

Actually, this is not always true: as soon as one applies the same patch to
different branches (e.g. to backport a fix from the master branch to a
previous release) the patch and eventual merge conflict resolution will
appear as a different commit, with a different identifier.

Cheers,
.Andrea
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20190321/ad03b0b8/attachment.html>