emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Oleh Krehel <ohwoeowho@gmail.com>
To: Josiah Schwab <jschwab@gmail.com>
Cc: Kyle Meyer <kyle@kyleam.com>, emacs-orgmode@gnu.org
Subject: Re: Merge branch 'maint'
Date: Fri, 11 Sep 2015 16:32:25 +0200	[thread overview]
Message-ID: <87lhcdgh6u.fsf@gmail.com> (raw)
In-Reply-To: <87a8stxgcc.fsf@gmail.com> (Josiah Schwab's message of "Fri, 11 Sep 2015 05:58:43 -0700")

Josiah Schwab <jschwab@gmail.com> writes:

Hi Josiah,

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

Thanks for the link. I've read it, and it does make sense.  But making
sense doesn't make it more convenient. I can understand some feature
branch being merged, but is the workflow of applying a single commit to
maint and merging maint into master really the best that Git can offer?

Would it be so hard for Git to perform a single merge of master into
maint on release, while keeping them separate and cherry-picking
in-between for the sake of a clean linear history?  The easy way would
be to rewrite maint on each release, but perhaps Git can do better?

    Oleh

next prev parent reply	other threads:[~2015-09-11 14:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-09 14:50 Merge branch 'maint' Oleh Krehel
2015-09-09 17:30 ` Kyle Meyer
2015-09-10 10:48   ` Oleh Krehel
2015-09-10 15:05     ` Robert Klein
2015-09-10 22:26     ` Kyle Meyer
2015-09-11 11:59       ` Oleh Krehel
2015-09-11 12:58         ` Josiah Schwab
2015-09-11 14:32           ` Oleh Krehel [this message]
2015-09-11 15:25             ` Stefan Nobis
2015-09-11 16:15               ` Oleh Krehel
2015-09-11 13:40         ` Achim Gratz
2015-09-11 15:24           ` Oleh Krehel
2015-09-15 12:16             ` Nicolas Richard
2015-09-11 13:08       ` Suvayu Ali

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=87lhcdgh6u.fsf@gmail.com \
    --to=ohwoeowho@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=jschwab@gmail.com \
    --cc=kyle@kyleam.com \
    /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

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).