From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Re: Merge 9.0.5 to emacs master? Date: Tue, 18 Apr 2017 13:02:19 +0000 Message-ID: References: <8737fmxibv.fsf@gnu.org> <871sv3q8nh.fsf@kyleam.com> <871sv2wjdl.fsf@bzg.fr> <87y3xaoxuz.fsf@kyleam.com> <87r332ni27.fsf@gmx.us> <87wpcuotlz.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=f403045ec682587ac4054d7085c1 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0SmG-0003lk-Ew for emacs-orgmode@gnu.org; Tue, 18 Apr 2017 09:02:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0SmA-0000Fg-Pn for emacs-orgmode@gnu.org; Tue, 18 Apr 2017 09:02:40 -0400 In-Reply-To: <87wpcuotlz.fsf@kyleam.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Kyle Meyer , emacs-org list , Bastien Guerry --f403045ec682587ac4054d7085c1 Content-Type: text/plain; charset=UTF-8 On Mon, Feb 13, 2017, 1:40 PM Kyle Meyer wrote: > Rasmus writes: > > [...] > > > I think we have discussed it before, but the best way seems to just copy > > the Org tree to the Emacs tree, right? > > Given the current setup, I think copying the files is best. I've > already resolved the conflicts when backporting Org-related commits from > the Emacs repo. > Just a minor nudge. If I understand correctly, everyone is in agreement that the org maint branch should be merged into emacs master branch now. This issue came up recently in an emacs-devel discussion. I don't have experience merging mega branches, but I can help in any other way in that direction. > -- Kaushal Modi --f403045ec682587ac4054d7085c1 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On Mon, Feb 13, 2017, 1= :40 PM Kyle Meyer <kyle@kyleam.com> wrote:
Rasmus <rasmus@gmx.us> writes:

[...]

> I think we have discussed it before, but the best way seems to just co= py
> the Org tree to the Emacs tree, right?

Given the current setup, I think copying the files is best.=C2=A0 I've<= br class=3D"gmail_msg"> already resolved the conflicts when backporting Org-related commits from the Emacs repo.

Just a minor nudge.=C2=A0

If I understand corre= ctly, everyone is in agreement that the org maint branch should be merged i= nto emacs master branch now.=C2=A0

This issue came= up recently in an emacs-devel discussion.=C2=A0

I= don't have experience merging mega branches, but I can help in any oth= er way in that direction.=C2=A0
--

Kaushal Modi

--f403045ec682587ac4054d7085c1--