国产av日韩一区二区三区精品,成人性爱视频在线观看,国产,欧美,日韩,一区,www.成色av久久成人,2222eeee成人天堂

Try git rebase origin/master

If you can’t pull down, it means you have no committed code locally, so you should either commit and push it up first, or git stash first and save it in the stack, then take it out at the appropriate time, and then git pull

Try to manually fetch and merge, then push it up, or even rebase it

git fetch

The local has more commit records than the remote, which means the local is newer than the remote, so it is not allowedpull

If there is no conflict between the remote code and your local code, directly modify the local code commit后 push to the remote one, and then it will be consistent.

If there is a conflict when pushing, you can

git fetch
git rebase origin/master

Follow the prompts to resolve conflicts.
Then push local code to remote