From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F3AFD13824A for ; Sun, 8 May 2016 22:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FE2821C074; Sun, 8 May 2016 22:25:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05268E07FE for ; Sun, 8 May 2016 22:25:40 +0000 (UTC) Received: from [192.168.1.2] (c-73-53-75-119.hsd1.wa.comcast.net [73.53.75.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zlg) by smtp.gentoo.org (Postfix) with ESMTPSA id 9FF20340901 for ; Sun, 8 May 2016 22:25:38 +0000 (UTC) Subject: Re: [gentoo-dev] On banning merge commits To: gentoo-dev@lists.gentoo.org References: <20160507235222.GA16750@ultrachro.me> <8760uoj23y.fsf@freja.aidecoe.name> <20160508055342.24ec8c9f.dolsen@gentoo.org> From: Daniel Campbell Message-ID: Date: Sun, 8 May 2016 15:25:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: <20160508055342.24ec8c9f.dolsen@gentoo.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bcBAIPilV92OW2PUmNFdDfdMVOc69AhRP" X-Archives-Salt: e1b21057-8f97-4222-ab96-1af332f00b76 X-Archives-Hash: c5941f3dbb9ed1ecc12319420377ef78 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --bcBAIPilV92OW2PUmNFdDfdMVOc69AhRP Content-Type: multipart/mixed; boundary="eP3cv964oF4JQj4ThCGf6Ah1loXjescaB" From: Daniel Campbell To: gentoo-dev@lists.gentoo.org Message-ID: Subject: Re: [gentoo-dev] On banning merge commits References: <20160507235222.GA16750@ultrachro.me> <8760uoj23y.fsf@freja.aidecoe.name> <20160508055342.24ec8c9f.dolsen@gentoo.org> In-Reply-To: <20160508055342.24ec8c9f.dolsen@gentoo.org> --eP3cv964oF4JQj4ThCGf6Ah1loXjescaB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 05/08/2016 05:53 AM, Brian Dolbec wrote: > On Sun, 08 May 2016 11:06:09 +0100 > Amadeusz =C5=BBo=C5=82nowski wrote: >=20 >> I am working at the moment on debundling ejabberd. It will come with >> ~30 packages and I will do "git merge --no-ff ejabberd-debundled" >> because it will actually look less messy. >> >> Thanks, >> -- Amadeusz =C5=BBo=C5=82nowski >=20 >=20 > Yes, this is exactly the type of merge commits that should be allowed. >=20 > Not the one or two user PR commits that might be based on a weeks old > tree, that a developer merges without rebasing. It is these merge > commits which have caused all the grief we've experienced over merge > commits. >=20 > Merge commits should be used wisely and for larger branch merges like > the kde, gnome team's development overlay merges to the main tree or > similar larger one off project's like the one above. It is these > larger commit branches that are much more difficult to "git pull > --rebase && git push --signed" successfully without some other pushes i= n > between causing a rejected non-fast forward push. >=20 I think you touched on the key phrase we should be taking from the conversation: 'merges without rebasing'. Devs are encouraged -- if not required -- to push commits after rebasing, to ensure we're pushing to the latest HEAD and not something that's stale. If we hold merges to the same standard, would the problems that some have with merge commits disappear? --=20 Daniel Campbell - Gentoo Developer OpenPGP Key: 0x1EA055D6 @ hkp://keys.gnupg.net fpr: AE03 9064 AE00 053C 270C 1DE4 6F7A 9091 1EA0 55D6 --eP3cv964oF4JQj4ThCGf6Ah1loXjescaB-- --bcBAIPilV92OW2PUmNFdDfdMVOc69AhRP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL7zcAAoJEAEkDpRQOeFwcKEQAMvlEzUBzFU5aJ+6fNJimwWV kLNxD6hoWMTpYWHURjOje9Z9oXyB2ovXcw6iNTVSb80D2a+PzevNpiX0LZ5UFvYb aNamT5jgsBDaLz1lEx5hzZXoAlYZ+qaSBkPRrF3s5o6tlLIKYylXa1ZaJKEt+7F1 pgumBgLLei8i6ifav0UEF+pGhlnWr/ZUOLiU/ovDo6FlLsXb6PPN23ZweWdpURzn Pmm5MeAJyQ8DYQOsu+Wg1NAZNdpq4z+++p+9KIHAZCPb9EQY4QjkSVgbE/Xwmc10 bk8PIrxizatclZ94AsIxwv2gkqJYmv6b8RySo0zzsW9w+GPiiBrBxpM0HMva4ot7 io02xslcgeJckK4M62MidqGoyiSa9EORelsWl/4zRFAnZLwG4qrAQOUyRZNuJoca 7FVZzeRTUHlRfZjaN6IsuaYTfjiCHi0AeUclYa3DPRSLAV0ThB1gDHOOo8Z0InLD XonY8SdS4Dem6hPTQHneunMP20hKY2bT+devkt7mKAuN/MUcxuNxITUwsuEwwtRG /Fyl3w+0ktv2U0IqGAdlMxxq/nqLM1J6NcurY5QDgVY1C1H9O48FSKF0tO4XUcE8 6BPzPtprhyZhCrv7bCw49GvtAk44J0eSKQB0tDVkzc5zOYmyha64M3HVT17se3+e +FQlyjHfwHvhpSgUInaT =kQf+ -----END PGP SIGNATURE----- --bcBAIPilV92OW2PUmNFdDfdMVOc69AhRP--