all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "John Wiegley" <johnw@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: larsi@gnus.org, emacs-devel@gnu.org, rpluim@gmail.com,
	eggert@cs.ucla.edu
Subject: Re: Rebasing vs. merging
Date: Wed, 19 Aug 2020 09:22:24 -0700	[thread overview]
Message-ID: <m2o8n6d2rj.fsf@newartisans.com> (raw)
In-Reply-To: <838seaelk9.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 19 Aug 2020 17:51:02 +0300")

>>>>> "EZ" == Eli Zaretskii <eliz@gnu.org> writes:

EZ> Please note that I didn't want to start any "philosophical" arguments wrt
EZ> Git, nor have another "merge vs rebase" argument, of which we had enough
EZ> in the past, I think. All I wanted to say was that we have discussed this
EZ> in the past, and decided to use a merge-based workflow (bugfixes are
EZ> pushed to the stable branch and then merged to master), and to stop caring
EZ> about the merge-commits created by Git when there's a "push race".

Thanks Eli, I think this is a reasonable pattern to continue with.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2



  parent reply	other threads:[~2020-08-19 16:22 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200816182558.16607.52991@vcs0.savannah.gnu.org>
     [not found] ` <20200816182601.16F2A209AC@vcs0.savannah.gnu.org>
2020-08-16 18:34   ` master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Lars Ingebrigtsen
2020-08-16 19:03     ` Eli Zaretskii
2020-08-16 19:13       ` Lars Ingebrigtsen
2020-08-17 14:15     ` Robert Pluim
2020-08-17 14:57       ` Stefan Monnier
2020-08-17 15:37         ` Robert Pluim
2020-08-17 16:58           ` Eli Zaretskii
2020-08-17 16:03         ` Andreas Schwab
2020-08-17 19:54           ` Stefan Monnier
2020-08-17 20:05             ` Andreas Schwab
2020-08-17 20:31               ` Stefan Monnier
2020-08-18  9:41                 ` Yuri Khan
2020-08-18 16:48                   ` Stefan Monnier
2020-08-18 18:47                     ` Yuri Khan
2020-08-19  5:16                     ` Madhu
2020-08-19 13:15                       ` Stefan Monnier
2020-08-17 15:58       ` Eli Zaretskii
2020-08-17 16:11         ` Paul Eggert
2020-08-17 16:26           ` Lars Ingebrigtsen
2020-08-17 16:29             ` Paul Eggert
2020-08-17 17:01               ` Lars Ingebrigtsen
2020-08-17 17:08             ` Eli Zaretskii
2020-08-17 18:03               ` Lars Ingebrigtsen
2020-08-17 18:16                 ` Eli Zaretskii
2020-08-17 18:43                   ` Lars Ingebrigtsen
2020-08-17 19:28                     ` Eli Zaretskii
2020-08-17 20:05                     ` David De La Harpe Golden
2020-08-18 19:02                       ` Basil L. Contovounesios
2020-08-19  3:56                         ` Amin Bandali
2020-08-19 13:04                         ` Stephen Leake
2020-08-19  9:13                     ` Rebasing vs. merging Teemu Likonen
2020-08-19  9:49                       ` Kévin Le Gouguec
2020-08-19 14:51                       ` Eli Zaretskii
2020-08-19 16:09                         ` Paul Eggert
2020-08-19 16:22                         ` John Wiegley [this message]
2020-08-17 18:45                   ` Rebasing vs merging (was: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs) Óscar Fuentes
2020-08-17 17:02           ` master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Eli Zaretskii

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2o8n6d2rj.fsf@newartisans.com \
    --to=johnw@gnu.org \
    --cc=eggert@cs.ucla.edu \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=larsi@gnus.org \
    --cc=rpluim@gmail.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.