Re: [PEAR-DEV] Re: Crypt_GPG patches / github merge button

[email protected] (Christian Weiske) Wed, 19 Aug 2015 06:20:53 +0200
Newsgroups php.pear.dev
Message-ID <20150819062053.1f5dc54c@bogo>
Hi Mike,


> I got in touch with Alec and giving maintainer status to him. The PRs 
> look great.

Thanks!


I saw you used the github merge button.
It makes the history very ... unreadable:

http://fotostore.cweiske.de/screenshots/2015-08-19%20mail_mime%20git%20merge%20button.png

Also see the following blog post describing this very problem:
http://blog.spreedly.com/2014/06/24/merge-pull-request-considered-harmful/

It's better to manually rebase patches against master before merging
them (and maybe even squashing them into a single commit).

-- 
Regards/Mit freundlichen Grüßen
Christian Weiske

-=≡ Geeking around in the name of science since 1982 ≡=-
signature.asc (application/pgp-signature, 181 B)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEARECAAYFAlXUBCUACgkQFMhaCCTq+COMCACg7DlU3UXvi5o1yKoSn0TknMdr
b80An18IadYwE3dhEqD7x1fn8/sWk+1Q
=qhle
-----END PGP SIGNATURE-----