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 EB9611381F3 for ; Mon, 13 May 2013 07:09:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EE7EE09DC; Mon, 13 May 2013 07:09:48 +0000 (UTC) Received: from mail.plaimi.net (107.4.189.109.customer.cdi.no [109.189.4.107]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E6E3E08C1 for ; Mon, 13 May 2013 07:09:47 +0000 (UTC) Received: by mail.plaimi.net (Postfix) with ESMTPSA id CA15A40994 for ; Mon, 13 May 2013 09:09:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=plaimi.net; s=leet; t=1368428985; bh=birhKnTKg8qiXu4RkTQf2vRRSJe/w3dxwf5kSeWFoC8=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=JQcAkodsWMmDOMD5C9UZOQdUENHPBoZ98ihPbfa7BrSDUP2DtaCadBiYTsrvoBqyl ZO8eVEY1OxbP0j/XTsGIzBIrVRDmM5/DNAU05tZYkIndExCXOm5hRxawr22Cz8pxqM fT24DoKCpQ7YMbsf6pqFjhBC878vT/l3PGpvaRh0= Message-ID: <519091BD.9090106@plaimi.net> Date: Mon, 13 May 2013 09:09:49 +0200 From: Alexander Berntsen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130417 Thunderbird/17.0.5 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 To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Re: devmanual moved to github References: <518FAF6B.80501@gentoo.org> <20879.47550.568189.770408@a1i15.kph.uni-mainz.de> <518FBB3D.1030002@gentoo.org> <20130512172003.9979.qmail@stuge.se> <20130512182409.15383.qmail@stuge.se> <519013C3.7070806@plaimi.net> <20130512222106.5178.qmail@stuge.se> <51901689.10905@plaimi.net> <20130512223759.7855.qmail@stuge.se> In-Reply-To: <20130512223759.7855.qmail@stuge.se> X-Enigmail-Version: 1.6a1pre Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Archives-Salt: 3c85f8e0-356e-4a3f-90d6-c7ceda0c1cac X-Archives-Hash: 3d51d9a5f0df8de4873d50506b9abbda -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 13/05/13 00:37, Peter Stuge wrote: >> And for the record I have not had problems with messy merges when >> commiting pull requests. > As I wrote: It works fine but doesn't scale; the mess is that you > always get a merge commit, which is usually unneccessary for > smaller contributions such as those from users, as opposed to > larger ones spanning more commits and/or branches worked on over > longer time from developers. You don't always get merge commits. I have committed pull requests without merge commits. See wking's email. - -- Alexander alexander@plaimi.net http://plaimi.net/~alexander -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iF4EAREIAAYFAlGQkb0ACgkQRtClrXBQc7XRUgEAtMuv081P9CVOLx07Ckk8ydCv RydQq5z983v3ps15vGIA/2oLQ63PzWIeISJlzH2fz/TPq6iYrVdTaiCFPhpYjcKq =wRDo -----END PGP SIGNATURE-----