Update message_advice_pull_before_push to mention how to push after rebasing

From: zhang kai <kylerzhang11@gmail.com>
Date: Mar 28, 2024, 09:54 UTC
Message-ID: <CAK_130T8sZUZAuvj4x7sB278kVL7ARaBv3Pg2djQB45O+7xKTg@mail.gmail.com>

Hi all,

Our team uses git rebase a lot. A common hiccup we noticed during the daily work is that new devs often didn't know how to push properly after the rebase.

When someone try to push to the remote after rebasing the branch, the push would mostly fail with the message_advice_pull_before_push:

> Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. If you want to integrate the remote changes,\n" "use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details.

However, in this situation, pull will "invalid" the rebasing. After pull then push, devs often will be surprised by the merge/pull request containing diffs that should not be in this branch. In this case, we often should just do `git push --force-with-lease`.

If we add a message like "If you just rebased your branch, please consider 'git push --force-with-lease'" to the message_adivce_pull_before_push, we may save devs some time figuring out what's wrong with their branch. If this is acceptable, we'd be happy to prepare a patch.

Thanks, Kai