On Mon, Jun 21, 2021 at 11:52 AM Felipe Contreras
[off-list ref] wrote:

+                "If unsure, run \"git pull --no-rebase\".\n"

I don't think the message should recommend merging over rebasing;
which strategy is the correct one depends entirely on the project's
workflow and the user's role within that workflow. 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.

-Alex