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 v3: - Update the tests - Don't explicitly credit Junio 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 | 27 +++++++----- remote.c | 5 ++- t/t7508-status.sh | 110 ++++++++++++++++++++++++++++++++++++---------- 3 files changed, 107 insertions(+), 35 deletions(-) Range-diff against v3: 1: 9cbf5f138e < -: ---------- remote: advise about force-pushing as an alternative to reconciliation -: ---------- > 1: 9626721c13 remote: advise about force-pushing as an alternative to reconciliation 2: 727e1f7636 = 2: 209e86588a push: advise about force-pushing as an alternative to reconciliation -- 2.41.0
