On Tue, Jun 22, 2021 at 2:22 PM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > 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 No worries, you were trying to be a good citizen by reviewing patches, and the patches didn't come with links to the old threads (even if you recursively followed links provided in each email as far as I can tell), so I wouldn't expect you to know. But I saw you expressing similar sentiments as I had previously so I dug out my old email and linked it. > 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`? I think Junio already answered that over here: https://lore.kernel.org/git/xmqq360h8286.fsf@xxxxxxxxxxxxxxxxxxxxxx/ (he discussed it multiple times in that thread, but hopefully that's a good enough example).
