From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Bastien <bzg@altern.org>
Cc: Chong Yidong <cyd@gnu.org>,
"Jambunathan K." <kjambunathan@gmail.com>,
schulte eric <schulte.eric@gmail.com>,
emacs-devel@gnu.org
Subject: Re: Merging Org 7.8.02 before Emacs 24.1
Date: Sat, 31 Dec 2011 05:39:47 -0500 [thread overview]
Message-ID: <jwvty4hqb3z.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <877h1df8ny.fsf@altern.org> (Bastien's message of "Sat, 31 Dec 2011 09:27:13 +0100")
> This is what I will try to do from now on: the Org master branch is for
> development and the maint branch is for bug fixes.
I'd suggest you setup a regular "merge from Emacs trunk". So your
"maint" branch can simply be the Emacs trunk.
Stefan
next prev parent reply other threads:[~2011-12-31 10:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-23 13:54 Merging Org 7.8.02 before Emacs 24.1 Bastien
2011-12-24 4:24 ` Jambunathan K
2011-12-24 7:31 ` Jambunathan K
2011-12-24 8:09 ` Bastien
2011-12-24 5:11 ` Leo
2011-12-26 7:44 ` Chong Yidong
2011-12-26 8:55 ` Bastien
2011-12-27 7:19 ` Jambunathan K
2011-12-27 10:47 ` Lennart Borgman
2011-12-29 4:42 ` Chong Yidong
2011-12-31 8:27 ` Bastien
2011-12-31 10:39 ` Stefan Monnier [this message]
2011-12-31 11:41 ` Bastien
2011-12-31 17:17 ` Eric Schulte
2011-12-26 21:32 ` Eric Schulte
2011-12-29 4:36 ` Chong Yidong
2011-12-29 16:41 ` Bastien
2012-01-03 19:45 ` Bastien
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvty4hqb3z.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=bzg@altern.org \
--cc=cyd@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kjambunathan@gmail.com \
--cc=schulte.eric@gmail.com \
/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.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).