Alex Henrie wrote: > On Mon, Jun 21, 2021 at 11:52 AM Felipe Contreras > <felipe.contreras@xxxxxxxxx> wrote: > > > > + "If unsure, run \"git pull --no-rebase\".\n" > > I don't think the message should recommend merging over rebasing; This is the default strategy. Doing `git pull` is the same as doing `git pull --no-rebase`, except with the warning. > The eventual goal is to get rid of the default here and make the user > make an educated choice, which does imply some work on the user's > part, but it avoids the massive headaches created by users merging > without understanding what they're doing. Indeed, but any minute change in git's UI is a gargantuan task that takes several years--or even decades--to accomplish, if it ever happens. I started this patch in 2013, and here we are. This patch series is not attempting to do the impossible. Cheers. -- Felipe Contreras
