From mboxrd@z Thu Jan  1 00:00:00 1970
From: Josiah Schwab <jschwab@gmail.com>
Subject: Re: Merge branch 'maint'
Date: Fri, 11 Sep 2015 05:58:43 -0700
Message-ID: <87a8stxgcc.fsf@gmail.com>
References: <87twr37il4.fsf@gmail.com> <87y4gfpkjy.fsf@kyleam.com>
	<87lhceo8he.fsf@gmail.com> <87mvwtvrkc.fsf@kyleam.com>
	<87vbbhgo9h.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58703)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jschwab@gmail.com>) id 1ZaNuk-0003Fz-63
	for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 08:58:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jschwab@gmail.com>) id 1ZaNug-0001GZ-Sv
	for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 08:58:50 -0400
Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:36553)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jschwab@gmail.com>) id 1ZaNug-0001GQ-Mq
	for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 08:58:46 -0400
Received: by padhk3 with SMTP id hk3so74657925pad.3
	for <emacs-orgmode@gnu.org>; Fri, 11 Sep 2015 05:58:45 -0700 (PDT)
In-reply-to: <87vbbhgo9h.fsf@gmail.com>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Oleh Krehel <ohwoeowho@gmail.com>
Cc: Kyle Meyer <kyle@kyleam.com>, emacs-orgmode@gnu.org

Hello Oleh,

On 11 September 2015 at 04:59 PDT, Oleh Krehel wrote:

> 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?

It may be helpful for you to do a some background reading on workflows
with git.  Have you ever read the gitworkflows man page?

  https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html

This page discusses many of the questions you have raised.

Best,
Josiah