On Tue, Jun 22, 2021 at 9:06 AM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Mon, Jun 21, 2021 at 8:15 PM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > > > My only serious objection to this patch is the instruction to merge if > > you don't know what to do instead of asking the repository maintainer > > what to do or reading the Git documentation. I don't have a strong > > opinion on the rest of the patch. > > You're not alone, Alex; I objected to that part as well. (See e.g. > https://lore.kernel.org/git/CABPp-BF4rXBOKsn8bG6y3QUEtNVV9K2Pk5NmwrU5818CqhRt_Q@xxxxxxxxxxxxxx/ > and various other emails in that thread, ending with "agree to > disagree" later). I still object to it as I did then. Thanks for the link, and sorry for not having followed this conversation closely enough to have seen your previous replies. While we're on the subject, do you have any thoughts on what (if anything) more should be done before making the switch to aborting instead of merging with a warning in `git pull`? -Alex
