From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: Thanks for Lilypond export (and minor comments) Date: Sat, 09 Jul 2011 10:46:19 +0200 Message-ID: <87iprbn8o4.fsf@gnu.org> References: <9E8B5700-6008-4832-ACE1-BF471F129E0E@beds.ac.uk> <87sjqhdfn3.fsf@gnu.org> <874o2x1rfz.fsf@gmail.com> <87oc15nvv1.fsf@gnu.org> <87oc14fpy5.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:40540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfTAh-0000bX-6d for emacs-orgmode@gnu.org; Sat, 09 Jul 2011 04:45:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfTAf-0006Zp-BG for emacs-orgmode@gnu.org; Sat, 09 Jul 2011 04:45:55 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:35892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfTAe-0006ZY-Uf for emacs-orgmode@gnu.org; Sat, 09 Jul 2011 04:45:53 -0400 Received: by fxd18 with SMTP id 18so2454523fxd.39 for ; Sat, 09 Jul 2011 01:45:51 -0700 (PDT) In-Reply-To: <87oc14fpy5.fsf@Rainer.invalid> (Achim Gratz's message of "Fri, 08 Jul 2011 23:00:18 +0200") 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Achim Gratz Cc: emacs-orgmode@gnu.org Hi Achim, Achim Gratz 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