From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Sat, 29 Nov 2014 14:55:22 +0200 Message-ID: <83d286b1z9.fsf@gnu.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> <87vbm0a6zv.fsf@engster.org> <8361e0o7ee.fsf@gnu.org> <87fvd4trzx.fsf@igel.home> <831tooo576.fsf@gnu.org> <87k32ga3dh.fsf@engster.org> <877fyg9t8y.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417265764 18180 80.91.229.3 (29 Nov 2014 12:56:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Nov 2014 12:56:04 +0000 (UTC) Cc: tzz@lifelogs.com, schwab@linux-m68k.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 29 13:55:55 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 1XuhZ4-0001Mu-Bw for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 13:55:54 +0100 Original-Received: from localhost ([::1]:47467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuhZ4-0000sR-0O for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 07:55:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuhYf-0000qJ-Vx for emacs-devel@gnu.org; Sat, 29 Nov 2014 07:55:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuhYb-0006eJ-8O for emacs-devel@gnu.org; Sat, 29 Nov 2014 07:55:29 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:61662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuhYa-0006e9-PF for emacs-devel@gnu.org; Sat, 29 Nov 2014 07:55:25 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NFS00F00WHCGK00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 29 Nov 2014 14:55:23 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFS00FG6X8AEO30@a-mtaout20.012.net.il>; Sat, 29 Nov 2014 14:55:23 +0200 (IST) In-reply-to: <877fyg9t8y.fsf@engster.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:178451 Archived-At: > From: David Engster > Cc: Eli Zaretskii , Andreas Schwab , tzz@lifelogs.com, emacs-devel@gnu.org > Date: Thu, 27 Nov 2014 23:24:45 +0100 > > Stefan Monnier writes: > >> You'll have to checkout master if you want to merge into it, so I did > >> not see the point putting it into emacs-24. If you feel strongly about > >> it, I can backport it. > > > > No, it's fine on master, thanks. > > I've also added some documentation in admin/notes/git-workflow. Thanks. I've now added to the Wiki a section about working with the master and the release branch, and that includes instructions on using gitmerge.el. I think we no longer need admin/notes/git-workflow. It gives the same instructions as the Wiki, but slightly differently, which might confuse. I think we should have a single place for these instructions. If someone thinks we need the instructions in the repository, I suggest to make a text copy of the Wiki. Otherwise, I think we should remove admin/notes/git-workflow. Any objections?