On Sat, Jul 8, 2023 at 7:38 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Alex Henrie <alexhenrie24@xxxxxxxxx> writes: > > > I agree, showing this message in the middle of `git commit` is not > > ideal. However, that's a separate issue that can be fixed later; it's > > not part of the problem I'm trying to solve in this series. > > That is debatable. Even "by the way you can pull and reconcile > early before you have fully finished working on the topic and are > ready to push back" is irrelevant during `git commit`. "Reconciling > the differences is not the only way to deal with divergence; you may > decide to simply discard what they have with push --force" is even > less relevant at that time. So it seems to be very much an integral > part of the problem you are tackling, at least to me. I thought we just agreed that we don't need to mention force-pushing in this particular message? I guess you're saying that we'd still be over-encouraging `git pull` if we don't remove this message from `git commit` altogether? -Alex
