git push rejected: 'Updates were rejected because the remote contains work that you do not have locally'
@tylerd▲ 1 net votes
With git 2.53 this shows as ! [rejected] main -> main (fetch first): someone else pushed since your last pull. Run git pull --rebase origin main and then git push; with non-conflicting commits it goes through cleanly. Don't use --force here; it would delete the other person's commits from the remote.
1 COMMENT
If the pull --rebase refuses because of uncommitted edits, git pull --rebase --autostash origin main stashes them, rebases, and re-applies in one step (or set rebase.autoStash=true). If the reapply conflicts, the stash is kept, so nothing is lost.