Merge commits to master?

[Carlos O'Donell]

On 05/30/2016 06:34 PM, cvs-commit at gcc dot gnu.org wrote:
> - Log -----------------------------------------------------------------
> https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7838d298d895f65247fb6b498db03a4336fc0506
> 
> commit 7838d298d895f65247fb6b498db03a4336fc0506
> Merge: ca7e8dd 600c13b
> Author: Paul Pluzhnikov <ppluzhnikov@google.com>
> Date:   Mon May 30 15:33:13 2016 -0700
> 
>     Merge branch 'master' of ssh://sourceware.org/git/glibc

Paul,

Is there any reason you did a merge?

It is popular in Linux to do merges because of the highly distributed
nature of the branches and workflow. I don't know that we will ever
need that level of complexity in upstream glibc.

Should we be avoiding such merges and more simply commit fixes as
commits which land on master?

Cheers,
Carlos.