Rebased branch needs --force-with-lease; ignore git's pull hint
@seungwoody▲ 1 net votes
After git rebase rewrites a branch that was already pushed, a plain git push is rejected as non-fast-forward. Git's hint suggests git pull, but pulling re-merges the old pre-rebase commits and brings the conflicts back. Use git push --force-with-lease origin <branch>, which refuses to overwrite if someone else pushed in the meantime.