emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: emacs-orgmode@gnu.org
Subject: Re: Merge 9.0.5 to emacs master?
Date: Mon, 13 Feb 2017 13:04:08 -0500	[thread overview]
Message-ID: <87wpcuotlz.fsf@kyleam.com> (raw)
In-Reply-To: <87r332ni27.fsf@gmx.us>

Rasmus <rasmus@gmx.us> 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.

-- 
Kyle

  reply	other threads:[~2017-02-13 18:04 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-10 13:53 Release 9.0.5 Bastien
2017-02-10 19:50 ` Jorge Morais Neto
2017-02-10 20:05   ` Bastien Guerry
2017-02-26 12:03   ` location of clocking out notes (was: Re: Release 9.0.5) Gregor Zattler
2017-02-26 13:21     ` location of clocking out notes Nicolas Goaziou
2017-02-10 20:25 ` Release 9.0.5 Fabrice Popineau
2017-02-10 21:37   ` Fabrice Popineau
2017-02-10 22:44     ` Fabrice Popineau
2017-02-11  0:47       ` Nicolas Goaziou
2017-02-11 15:37         ` Fabrice Popineau
2017-02-13 16:26           ` Nicolas Goaziou
2017-02-11  9:29     ` Colin Baxter
2017-02-10 22:12 ` Russell Adams
2017-02-12 22:29 ` Merge 9.0.5 to emacs master? (Was: Release 9.0.5) Kaushal Modi
2017-02-12 23:41   ` Kyle Meyer
2017-02-13  9:05     ` Merge 9.0.5 to emacs master? Bastien Guerry
2017-02-13 16:32       ` Kyle Meyer
2017-02-13 16:58         ` Rasmus
2017-02-13 18:04           ` Kyle Meyer [this message]
2017-04-18 13:02             ` Kaushal Modi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wpcuotlz.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).