Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > Hi Alex > > On 13/07/2023 05:41, Alex Henrie wrote: >> 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 somewhat more general advice that >> does >> not assume that the user always wants to do reconciliation. >> Changes from v4: >> - Don't show divergent branch advice in the middle of `git commit` >> - Soften the advice, but don't specifically mention force-pushing > > All three patches look fine to me, they are definitely an improvement > on the current advice. > > Thanks for working on this, > > Phillip Thanks, both. Will queue after taking another look.
