[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] Merge branch 'maint'
From: |
Josiah Schwab |
Subject: |
Re: [O] Merge branch 'maint' |
Date: |
Fri, 11 Sep 2015 05:58:43 -0700 |
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
- [O] Merge branch 'maint', Oleh Krehel, 2015/09/09
- Re: [O] Merge branch 'maint', Kyle Meyer, 2015/09/09
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/10
- Re: [O] Merge branch 'maint', Robert Klein, 2015/09/10
- Re: [O] Merge branch 'maint', Kyle Meyer, 2015/09/10
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint',
Josiah Schwab <=
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint', Stefan Nobis, 2015/09/11
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint', Achim Gratz, 2015/09/11
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint', Nicolas Richard, 2015/09/15
- Re: [O] Merge branch 'maint', Suvayu Ali, 2015/09/11