From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Bryan Turner <bturner@atlassian.com>,
Elijah Newren <newren@gmail.com>,
usbuser@mailbox.org, Git Mailing List <git@vger.kernel.org>
Subject: Re: Unexpected or wrong ff, no-ff and ff-only behaviour
Date: Thu, 11 Jul 2019 08:13:28 +0300 [thread overview]
Message-ID: <87sgrdf91j.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqtvbtu9uo.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Wed, 10 Jul 2019 09:34:39 -0700")
Junio C Hamano <gitster@pobox.com> writes:
[...]
> The "the tip being merged into the mainline must always be
> fast-forwardable",
It's rather "the tip being merged into the mainline must be fast-forwardable the
first time it is merged".
> however, is not consistent with the topic branch workflow, and I do
> not mean this in the sense that you should never rebase just before
> submitting (which is a bad practice). For an initial merge of the
> topic to the mainline, the project can keep rebasing to the
> then-current tip of the mainline, and as long as they can afford the
> cycle to test the result, "record the range of the topic branch by
> making a redundant merge" would work.
Yes, that's exactly it, and, as the rule holds for the first topic merge
only, the rest of workflow is as usual, no drastic changes.
Overall, it only ensures the first merge of the topic is semantically
simpler, nothing more.
-- Sergey
next prev parent reply other threads:[~2019-07-11 5:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 9:42 Unexpected or wrong ff, no-ff and ff-only behaviour usbuser
2019-07-09 14:51 ` Junio C Hamano
2019-07-09 16:15 ` Roland Jäger
2019-07-09 16:35 ` Elijah Newren
2019-07-09 17:00 ` usbuser
2019-07-09 20:33 ` Elijah Newren
2019-07-09 20:51 ` Bryan Turner
2019-07-10 7:49 ` usbuser
2019-07-10 16:34 ` Junio C Hamano
2019-07-11 5:13 ` Sergey Organov [this message]
2019-07-11 17:03 ` Junio C Hamano
2019-07-12 13:50 ` Sergey Organov
2019-07-12 16:24 ` Elijah Newren
2019-07-15 12:08 ` Sergey Organov
2019-07-12 18:33 ` Junio C Hamano
2019-07-15 12:47 ` Sergey Organov
2019-07-15 16:57 ` Junio C Hamano
2019-07-19 11:00 ` Sergey Organov
2019-07-11 15:46 ` brian m. carlson
2019-07-10 14:36 ` Sergey Organov
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgrdf91j.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=usbuser@mailbox.org \
/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 public inbox
https://80x24.org/mirrors/git.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).