From: Alex Henrie Date: Sun, 02 Jul 2023 20:08:16 GMT Subject: [PATCH 1/2] remote: advise about force-pushing as an alternative to reconciliation Message-ID: <20230702200818.1038494-2-alexhenrie24@gmail.com> In-Reply-To: <20230702200818.1038494-1-alexhenrie24@gmail.com> Also, don't imply that `git pull` is only for merging. Signed-off-by: Alex Henrie --- remote.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/remote.c b/remote.c index a81f2e2f17..161d0cfe96 100644 --- a/remote.c +++ b/remote.c @@ -2323,7 +2323,8 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb, base, ours, theirs); if (advice_enabled(ADVICE_STATUS_HINTS)) strbuf_addstr(sb, - _(" (use \"git pull\" to merge the remote branch into yours)\n")); + _(" (use \"git pull\" to reconcile your local branch with the remote branch,\n" + " or \"git push --force\" to overwrite the remote branch with your local branch)\n")); } free(base); return 1; -- 2.41.0