From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Having a custom merge process Date: Fri, 25 Dec 2015 23:35:37 -0800 Organization: UCLA Computer Science Department Message-ID: <567E4349.9020806@cs.ucla.edu> References: <8337urm0cv.fsf@gnu.org> <83ziwzkl50.fsf@gnu.org> <87lh8jvsqh.fsf@fencepost.gnu.org> <83si2qliho.fsf@gnu.org> <83d1tulaa1.fsf@gnu.org> <838u4il3jf.fsf@gnu.org> <83y4cijo24.fsf@gnu.org> <83twn6jm7e.fsf@gnu.org> <87twn686cn.fsf@isaac.fritz.box> <87poxunllj.fsf@gnus.org> <87mvsy84gj.fsf@isaac.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1451115373 18083 80.91.229.3 (26 Dec 2015 07:36:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 26 Dec 2015 07:36:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Engster , Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 26 08:36:05 2015 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 1aCjOW-0007rQ-1E for ged-emacs-devel@m.gmane.org; Sat, 26 Dec 2015 08:36:04 +0100 Original-Received: from localhost ([::1]:37826 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCjOV-0001up-CY for ged-emacs-devel@m.gmane.org; Sat, 26 Dec 2015 02:36:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCjOD-0001uV-TJ for emacs-devel@gnu.org; Sat, 26 Dec 2015 02:35:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCjO8-0002n8-UR for emacs-devel@gnu.org; Sat, 26 Dec 2015 02:35:45 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:35128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCjO8-0002n3-PK for emacs-devel@gnu.org; Sat, 26 Dec 2015 02:35:40 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 2FE02160CC0; Fri, 25 Dec 2015 23:35:39 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id r7I1o3TgFDMh; Fri, 25 Dec 2015 23:35:38 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 55109160D77; Fri, 25 Dec 2015 23:35:38 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7z366zLTUV0K; Fri, 25 Dec 2015 23:35:38 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 33EEC160CC0; Fri, 25 Dec 2015 23:35:38 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 In-Reply-To: <87mvsy84gj.fsf@isaac.fritz.box> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 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:196879 Archived-At: David Engster wrote: > The usual way to deal with this is to have one person who does the > merges ("the Merge Master"), who needs to have a good overview of > development and the used VCS and hence simply knows what to do. The > point of gitmerge.el is that pretty much anyone should be able to do the > merge. For what it's worth, I've done git merges for Emacs both with gitmerge.el and without, and although gitmerge.el is nicer it's not clear that it's worth the trouble. That is, it should be OK to use gitmerge.el to merge, and it should also be OK to not use it. Either way, you need to know what you're doing.