Maintaining my own branch with git

[Andrea Venturoli]

On 4/28/21 2:16 PM, Steve O'Hara-Smith wrote:

> 6: Update myworkingbranch with:
>     git rebase main
>     NB: This will stash your changes, bring in the updates and then reapply
>         your changes, requiring you to sort out any conflicts that come up.
> 7: After this rebase you will need to force push myworkingbranch to
>     your server

When I try this, I get:
> % git push
> To ssh://...
>  ! [rejected]                  netfence_main -> netfence_main (non-fast-forward)
> error: failed to push some refs to 'ssh://...'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Should I pull or push with "-f"?



  bye & Thanks
	av.