[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Rebasing vs. merging

From: John Wiegley
Subject: Re: Rebasing vs. merging
Date: Wed, 19 Aug 2020 09:22:24 -0700
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.50 (darwin)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]