git-我需要推送我的最新更改，并得到我的分支提示落后于远程对等方的错误

Question

Usually to resolve this I do git stash. But this time I want to make sure I push my change. Git stash just hides my changes, right? So is there a way to resolve this error message and make sure I push my code?

Answer 1

You need to fetch recent changes from the remote server and rebase your current branch against them:

git pull --rebase

After that (if you are lucky and no one has pushed more changes) you can push again:

git push