From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ashton Kemerling Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Tue, 12 Aug 2014 22:14:54 -0600 Message-ID: <87lhqtqb41.fsf@ashton-Aspire-5560.i-did-not-set--mail-host-address--so-tickle-me> References: <2720487.3bKIskrhp0@descartes> <87sil214zs.fsf@drakenvlieg.flower> <87lhqtv7vf.fsf@Rainer.invalid> <87iolxhwep.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1407903311 28564 80.91.229.3 (13 Aug 2014 04:15:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Aug 2014 04:15:11 +0000 (UTC) Cc: Achim Gratz , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 13 06:15:04 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XHPxm-0000VY-Iw for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 06:15:02 +0200 Original-Received: from localhost ([::1]:44956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHPxm-0003jW-3J for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 00:15:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHPxi-0003jG-FO for emacs-devel@gnu.org; Wed, 13 Aug 2014 00:14:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHPxh-0007pK-38 for emacs-devel@gnu.org; Wed, 13 Aug 2014 00:14:58 -0400 Original-Received: from mail-ig0-x234.google.com ([2607:f8b0:4001:c05::234]:45389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHPxg-0007pE-Ux for emacs-devel@gnu.org; Wed, 13 Aug 2014 00:14:57 -0400 Original-Received: by mail-ig0-f180.google.com with SMTP id l13so546658iga.1 for ; Tue, 12 Aug 2014 21:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=Qe7JWvdtuSccQkkcA/WKafugK7JhVfvcgpe7yVHtZck=; b=s1I1d6fXAgPtIwtPt2XN8MndVrh7tmGIu+uGp07g82nidjTmrCeuIFWp8RfnQB/+Mv Tz5DiqR4U/bw/Bb2uQPDDEWhbnIYqiR5MArmhs+t9k8cLRiVWfFusMvrQ8F4NNtCRz+G g8Euxm4VO0YKqs9Fn2Yjp4Zaqcs4tf7CAyz8kO41EdrdlKNp4KD1UwOPmZ/Ta56LcoFF 6Pco2DQ9lI20kOTinQBjwwakviLMorp6KLwM42e8z0V8bUSL87amOSss4zeUJeZRZotf Rue98ErqBto4WMIAB7pIucp/o7+//Df+alPIqdiPTVrAMMBXa+ULAeWjUEd/Y+tE4kaX xoUw== X-Received: by 10.42.126.82 with SMTP id d18mr3364904ics.88.1407903296338; Tue, 12 Aug 2014 21:14:56 -0700 (PDT) Original-Received: from ashton-Aspire-5560 ([73.34.13.39]) by mx.google.com with ESMTPSA id p5sm68401932iga.9.2014.08.12.21.14.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 12 Aug 2014 21:14:55 -0700 (PDT) In-Reply-To: <87iolxhwep.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Wed, 13 Aug 2014 12:59:42 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::234 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:173613 Archived-At: Furthermore, the increasing dominance of Github and its pullrequest+merge workflow proves that merge commits are not a complete hinderence even on similarly massive projects like RoR. While I certainly am in the "I don't like merge commits" camp, I don't think the presence or absence of merge commits is really worth humming and hawing over a lot, especially if it would delay a git conversion. I've worked in organizations that allowed them, and worked in organizations that hated them, and I noticed very little difference between the two on that front. -- Ashton Kemerling