From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bignum branch Date: Thu, 09 Aug 2018 16:01:05 +0300 Message-ID: <83y3dfofse.fsf@gnu.org> References: <87o9fbbw1t.fsf@tromey.com> <83wotxaiwi.fsf@gnu.org> <86k1pxmvmx.fsf@gmail.com> <87efg4a9xc.fsf@tromey.com> <87a7qr8cz7.fsf@tromey.com> <86tvoy3je9.fsf@gmail.com> <86bmb0vbxf.fsf@gmail.com> <87k1pnfcg1.fsf@tromey.com> <86sh4b1833.fsf@gmail.com> <861sbgz3dm.fsf@gmail.com> <83a7q4ufxp.fsf@gnu.org> <87wot71hpb.fsf@tromey.com> <86in4rgt1m.fsf@gmail.com> <83pnyyu0k1.fsf@gnu.org> <86k1p59haq.fsf@gmail.com> <83va8osuz2.fsf@gnu.org> <87ftzrknyg.fsf@tromey.com> <87d0usjvse.fsf@tromey.com> <837el0p8u5.fsf@gnu.org> <87wot0vukj.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1533819556 25771 195.159.176.226 (9 Aug 2018 12:59:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Aug 2018 12:59:16 +0000 (UTC) Cc: tom@tromey.com, andrewjmoreton@gmail.com, emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 09 14:59:12 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fnkX1-0006cD-Mt for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 14:59:11 +0200 Original-Received: from localhost ([::1]:50690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnkZ8-0005aq-AE for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 09:01:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnkYx-0005Mc-S7 for emacs-devel@gnu.org; Thu, 09 Aug 2018 09:01:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnkYt-0002ym-Sp for emacs-devel@gnu.org; Thu, 09 Aug 2018 09:01:11 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnkYt-0002ye-No; Thu, 09 Aug 2018 09:01:07 -0400 Original-Received: from [176.228.60.248] (port=4372 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fnkYs-00049Y-TS; Thu, 09 Aug 2018 09:01:07 -0400 In-reply-to: <87wot0vukj.fsf@gmx.de> (message from Michael Albinus on Thu, 09 Aug 2018 09:59:56 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:228328 Archived-At: > From: Michael Albinus > Cc: Tom Tromey , andrewjmoreton@gmail.com, emacs-devel@gnu.org > Date: Thu, 09 Aug 2018 09:59:56 +0200 > > Eli Zaretskii writes: > > >> Still wondering about git merge -vs- git rebase for this branch. > > > > If you are wondering because you are not sure what are our policy, > > then you should know we don't have one. Some people merge, others > > rebase, still others do a mix. So it's up to you, I think. > > emacswiki recommends "git merge", see > . That's a recommendation, not a mandatory policy. People have been doing things differently right and left. > Maybe we shall add a similar section (Working in a Task Branch) to > admin/notes/git-workflow, be it "git merge" or "git rebase" based. Or > simply link to emacswiki. We already say that in CONTRIBUTE. (I don't really understand why git-workflow exists, but at the time people objected to delete it.)