From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: bignum branch Date: Thu, 09 Aug 2018 09:59:56 +0200 Message-ID: <87wot0vukj.fsf@gmx.de> 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> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1533801542 32139 195.159.176.226 (9 Aug 2018 07:59:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Aug 2018 07:59:02 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Tom Tromey , andrewjmoreton@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 09 09:58:58 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 1fnfqR-0008BU-8W for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 09:58:55 +0200 Original-Received: from localhost ([::1]:48548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnfsX-0001iW-Pb for ged-emacs-devel@m.gmane.org; Thu, 09 Aug 2018 04:01:05 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnfrn-0001fa-95 for emacs-devel@gnu.org; Thu, 09 Aug 2018 04:00:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnfrh-0000Gd-R3 for emacs-devel@gnu.org; Thu, 09 Aug 2018 04:00:19 -0400 Original-Received: from mout.gmx.net ([212.227.17.20]:53269) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnfrh-0000Fh-Gj; Thu, 09 Aug 2018 04:00:13 -0400 Original-Received: from detlef.gmx.de ([212.86.52.114]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Mchyv-1fVjTD0iEj-00Hu2H; Thu, 09 Aug 2018 09:59:58 +0200 In-Reply-To: <837el0p8u5.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 09 Aug 2018 05:33:38 +0300") X-Provags-ID: V03:K1:6CeQAbNnIegahSoxKHw1nqJi8ZyVbpcjs+iKxma7f7RK1ZdgYnW PgHI0K0AkgVCUNpcFNybf1zXGaF8UaAtieRpiy6Prw7fPOhX9pEYXGSz43bTw4IfPsUeg1X oOkKMIGz+inCrKgS6Ge0L5X6fH9n5A8doXfMS63giMuFDMOZM0c2kCWpNcHWpwrpbsj0FFJ HCAOmbHDzIes3GBJe9+vg== X-UI-Out-Filterresults: notjunk:1;V01:K0:kvpRkiVuokw=:spYLI2YbAfEPhmnpsHaZRU bUXaO8NwanJ2CsUf3OCduhhjwXqQMEExos6vEe3md2Get/rMBkQ9CIClgz++niOhigPiWclVX FuDPIPEsyMs/bCnWCTY8OT5rhwzE7fj8Wrsr5YqDvmLdI585ILIdbXFdbDQqwbKnEjxmCA6Ut a0YdIvLXmXZ8+YT2DKGKP2sczc1cf6rbAJJBJ0JWz+WeYpibz+nQJriQtnTYn9WJVilzj9wDW PjVv0NXhAyFFdglZGeYs70hcYWJP0tU8io3FEC5saiBO+r87o58Mdi4sGPzZzQ2TF91EbUVU4 KNxt1NcuL2sR3WQ08uFSsSXKg72UEOtPLkEYe6B2xUDncQJMA8+5c5vb+Ng7hRHv0HpFzM6iN GBObsOnzPGn2bfUYD5Irc4o6Wmz2TpOtLYZN8tanD0oVqK3Grca1QARPlxgK3oGS/nUmgVYBE spjl7nBMFqpT21cL7bTccTdZuPspJrMAGuiyJ3K+t9sbRPrJBlCOL3aSGv8qYWotuiBvd+/vH o0tyhBCheqUtxQ9TMzpM/TZjVFc4TM8scKfKzKIcDAFwSHu25zU6+KGj8HlTV09c9gsbO24nj vs7j13MGK04zDMBEkEPTWs4o024xIkhCMfJygmMJPDqStkZT+NtNSrNY7sGpzbR0k2hOHaaCr JiSqxdR0azxsGokUy9ygen5Bp/gXRCTWbtmCxOQCDDHyvNKmFekVNvF1w+FEouK+j6ctXJn/W kWeZtnrZ6Wj2HYxGIyJK3vlItygERY2XIIHDCEDeq0/Jq5JC37rDJq64gdrzMvXHtTeCLpkj X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.20 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:228324 Archived-At: 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 . 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. Best regards, Michael.