Many times now, I have seen novices do the following:
1. Start work on their own personal topic branch
2. Push the branch to origin
3. Rebase the branch onto origin/master
4. Try to push again, but Git says they need to pull
5. Pull and make a mess trying to reconcile the older topic branch with
the rebased topic branch
Help avoid this mistake by giving advice that mentions force-pushing,
rather than assuming that the user always wants to do reconciliation.
Changes from v1:
- Recommend --force-with-lease instead of plain --force
- Consistently wrap messages to 72 characters
Alex Henrie (2):
remote: advise about force-pushing as an alternative to reconciliation
push: advise about force-pushing as an alternative to reconciliation
builtin/push.c | 29 +++++++++++++++++------------
remote.c | 4 +++-
2 files changed, 20 insertions(+), 13 deletions(-)
Range-diff against v1:
1: 48a9f6b1fa ! 1: d0cb607225 remote: advise about force-pushing as an alternative to reconciliation
@@ remote.c: int format_tracking_info(struct branch *branch, struct strbuf *sb,
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"));
++ " or \"git push --force-with-lease\" to overwrite the remote branch with\n"
++ " your local branch)\n"));
}
free(base);
return 1;
2: 0d47c23320 < -: ---------- push: advise about force-pushing as an alternative to reconciliation
-: ---------- > 2: 3295f0bb2b push: advise about force-pushing as an alternative to reconciliation
--
2.41.0
