From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 15 Jul 2021 09:48:10 GMT
Subject: RE: [PATCH 5/5] pull: abort by default when fast-forwarding is not possible
Message-ID: <60f0045aad10c_2e6720891@natae.notmuch>
In-Reply-To: <7e12c45fc9a94e7b56a6efdc085ebe081dd40afc.1626316849.git.gitgitgadget@gmail.com>

Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> We have for some time shown a long warning when the user does not
> specify how to reconcile divergent branches with git pull.  Make it an
> error now.

A warning doesn't imply deprecation.

Users have been warnged *zero* days that the default is going to change,
to what it's going to change, how to configure the new behavior, or how
to keep the old behavior.

NAK.

-- 
Felipe Contreras