emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bastien <bzg@altern.org>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: Thanks for Lilypond export (and minor comments)
Date: Sat, 09 Jul 2011 10:46:19 +0200	[thread overview]
Message-ID: <87iprbn8o4.fsf@gnu.org> (raw)
In-Reply-To: <87oc14fpy5.fsf@Rainer.invalid> (Achim Gratz's message of "Fri, 08 Jul 2011 23:00:18 +0200")

Hi Achim,

Achim Gratz <Stromeko@nexgo.de> writes:

> Pure fixes should probably be applied on top of maint and then merged
> into master (not cherry-picked from master to maint, this would create
> duplicate history).  On occasion this might produce a merge conflict,
> but these instances should be rare.
>
> That way maint would be a stable, but still regularly bugfixed branch
> without having all the excitement of living on master and having old
> features pulled from under you while the new features aren't quite there
> yet.  If any larger bugs crop up, you can always tag a sub-release on
> maint and create a package for anyone not using git.

Yes, AFAIU that's what is described in README_maintainer.

I will try to stick to this process.

-- 
 Bastien

  reply	other threads:[~2011-07-09  8:45 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07 16:38 Thanks for Lilypond export (and minor comments) Torsten Anders
2011-07-07 20:01 ` Bastien
2011-07-08  1:35   ` Eric Schulte
2011-07-08  6:13     ` Bastien
2011-07-08  7:00       ` Nick Dokos
2011-07-08  9:08         ` Bastien
2011-07-08 16:02           ` Suvayu Ali
2011-07-09  8:44             ` Bastien
2011-07-10 16:50               ` Suvayu Ali
2011-07-11 16:50                 ` Bastien
2011-07-11 17:50                   ` suvayu ali
2011-07-19 12:29                   ` Bernt Hansen
2011-07-19 12:40                     ` suvayu ali
2011-07-08 21:00       ` Achim Gratz
2011-07-09  8:46         ` Bastien [this message]
2011-07-08  7:56     ` Martyn Jago

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=87iprbn8o4.fsf@gnu.org \
    --to=bzg@altern.org \
    --cc=Stromeko@nexgo.de \
    --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).