From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Re: Minor addition to Speed Keys info node Date: Thu, 08 Jun 2017 10:02:55 +0000 Message-ID: References: <87fufbzs2t.fsf@nicolasgoaziou.fr> <877f0nzgym.fsf@nicolasgoaziou.fr> <8737bbzdlq.fsf@nicolasgoaziou.fr> <87y3t3xv9a.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a114727829a3afb05516ff533" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIuHV-0005L0-St for emacs-orgmode@gnu.org; Thu, 08 Jun 2017 06:03:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIuHV-0000Vd-0H for emacs-orgmode@gnu.org; Thu, 08 Jun 2017 06:03:09 -0400 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]:33188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIuHU-0000UV-Q9 for emacs-orgmode@gnu.org; Thu, 08 Jun 2017 06:03:08 -0400 Received: by mail-lf0-x229.google.com with SMTP id a136so15930483lfa.0 for ; Thu, 08 Jun 2017 03:03:08 -0700 (PDT) In-Reply-To: <87y3t3xv9a.fsf@nicolasgoaziou.fr> 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" To: Nicolas Goaziou Cc: emacs-org list --001a114727829a3afb05516ff533 Content-Type: text/plain; charset="UTF-8" On Wed, Jun 7, 2017, 6:56 PM Nicolas Goaziou wrote: > Why would you? It is a good habit to merge maint into master after > a patch. Just because I cannot always be sure that all the commits made by someone else in maint branch are applicable in master branch too. I didn't do it for my own commit because I'm about to commit > something else and wanted to reduce a bit the number of merge commits. Thanks, that makes sense. So typically one wouldn't come across a decision point if they should or shouldn't merge the maint branch commits made by someone else. And in the case there are commits that should not be merged to master, you just cherry-pick, right? -- Kaushal Modi --001a114727829a3afb05516ff533 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Wed, Jun 7, 2017, 6:56 PM Ni= colas Goaziou <mail@nicolasgoa= ziou.fr> wrote:
Why would you? It is a good habit to merge maint into master after
a patch.

Just because I cannot alway= s be sure that all the commits made by someone else in maint branch are app= licable in master branch too.

I didn't do it for my own commit b= ecause I'm about to commit
something else and wanted to reduce a bit the number of merge commits.

Thanks, that makes sense.=C2=A0

So typically one wouldn't come across a decision point = if they should or shouldn't merge the maint branch commits made by some= one else.

And in the case there are commits that s= hould not be merged to master, you just cherry-pick, right?
--

Kaushal Modi

--001a114727829a3afb05516ff533--