git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Alex Henrie <alexhenrie24@gmail.com>
To: Git mailing list <git@vger.kernel.org>
Subject: Pull warning
Date: Thu, 22 Apr 2021 21:12:51 -0600	[thread overview]
Message-ID: <CAMMLpeSsczjaTyuKgeLs2zLew5gX6KxzzDJK9pnamyYJd6rhkg@mail.gmail.com> (raw)

Hello again,

Where did we wind up concerning the "Pulling without specifying how to
reconcile divergent branches" warning? Last I checked, there was
consensus that Git shouldn't allow non-fast-forward pulls by default,
but there was disagreement over how to refactor the code to make that
happen. However, since the warning now only appears if the pull would
not be a fast-forward, it seems to me that we could simply change it
from a warning to an error after a few more releases and update the
tests. Does that sound reasonable, or do people still want to see more
architectural changes first?

-Alex

                 reply	other threads:[~2021-04-23  3:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=CAMMLpeSsczjaTyuKgeLs2zLew5gX6KxzzDJK9pnamyYJd6rhkg@mail.gmail.com \
    --to=alexhenrie24@gmail.com \
    --cc=git@vger.kernel.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).