From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleh Krehel Subject: Re: Merge branch 'maint' Date: Fri, 11 Sep 2015 13:59:38 +0200 Message-ID: <87vbbhgo9h.fsf@gmail.com> References: <87twr37il4.fsf@gmail.com> <87y4gfpkjy.fsf@kyleam.com> <87lhceo8he.fsf@gmail.com> <87mvwtvrkc.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaMyw-0004Fe-FM for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 07:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaMyr-0005JU-Gu for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 07:59:06 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:35361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaMyr-0005JP-AL for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 07:59:01 -0400 Received: by wicge5 with SMTP id ge5so60050545wic.0 for ; Fri, 11 Sep 2015 04:59:00 -0700 (PDT) In-Reply-To: <87mvwtvrkc.fsf@kyleam.com> (Kyle Meyer's message of "Thu, 10 Sep 2015 18:26:59 -0400") 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: Kyle Meyer Cc: emacs-orgmode@gnu.org Kyle Meyer writes: >> As far as I understood, maint is a subset of master, i.e. all commits >> that are in maint are in master as well. Is that correct? > > Yes. As long as there aren't any new commits on maint that have yet to > be merged What is the purpose of maint exactly? In Emacs git repository there's master and emacs24. All commits apply to master first, while some are cherry picked onto emacs24. The emacs24 branch will never be merged into master: it's divergent and that's fine. As I understood, for Org mode some commits are applied to maint, and then merged into master. Why? Oleh