[PATCH v2 1/2] remote: advise about force-pushing as an alternative to reconciliation
Also, don't imply that `git pull` is only for merging.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
remote.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/remote.c b/remote.c
index a81f2e2f17..009034ecde 100644
--- a/remote.c
+++ b/remote.c
@@ -2323,7 +2323,9 @@ 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-with-lease\" to overwrite the remote branch with\n"
+ " your local branch)\n"));
}
free(base);
return 1;
--
2.41.0
Alex Henrie <alexhenrie24@gmail.com>