Re: [PATCH v3 1/2] remote: advise about force-pushing as an alternative to reconciliation

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 9, 2023, 01:38 UTC
Message-ID: <xmqqbkgl6f04.fsf@gitster.g>
In-Reply-To: <CAMMLpeQ2P+qQxo17dEdWhMHcmAfTiBoEifp2wUjWVrP+oGSzxQ@mail.gmail.com>

Alex Henrie <alexhenrie24@gmail.com> 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.