yesterday I push the code in the company computer to the github warehouse, and then the code in my own computer has also been changed, but I don"t have push, today. I want to update the code of yesterday"s push in the company to my local error report.
execute git pull origin master:master why the native code is still the same.
do you have to execute git push before you want to git pull?
first of all, this is not a mistake.
this is just a reminder that the code in your current workspace conflicts with the remote code and requires to resolve the conflict .
there are two ways to solve this problem.
I hope my answer will be helpful to you.
you can temporarily save your own code
git stash
git pull origin master
git stash pop
Previous: On Mini Program's drawing
Next: Js determines whether a number is within an interval or whether it is equal to it.
vscode uses git to enter a git account and password every time it is pushed. I don t need it before, and now I don t know why ...
as mentioned, I imported github s project with Aliyun code, but I don t know how to release a version? Ask the great god for advice! Thank you! ...
enter hexo d to appear: fatal: git@github.com lixinblog lixinblog.github.io.git does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. ...
suddenly reported an error one day. The warehouse uses github, which is all right at three o clock. git remote uses the project s ssh, and that s right. The value of id_rsa.pub is saved and (github setting is re-added on github to indicate that it ...
other people s vscode has a special click to git add pull commit push command, but mine doesn t seem to have this function and is also the latest version of . How to use a page that needs to be uploaded? ...
Today, I saw that the dependency of npm can be configured with a git address. I would like to know what files I downloaded through npm if I configured the address of git. How do you specify these documents? And how to specify branches or tag? ...
I modified the code on the first computer yesterday, but I didn t submit it to github. Then after going back, git clone url downloaded the code on the second computer, modified it, and then submitted it to github. I now want to update the local warehous...
first of all, Code Cloud submission, because this folder is under Code Cloud remote warehouse clone, so there is no problem with associated submission git add. git commit-m "gitee " git remote add gitee git@gitee.com:xxx jkPT.git then githup submi...
...
how can git reset only return the version of the git repository to a certain version without affecting the workspace and the staging area? with such a rollback, all the new things in the workspace are gone ...
After git commit demo1.txt, it is still added to the version library ...
No problem on this machine and on my own server your own server github pages ...
is it all about master? ...
I downloaded master from fork + clone and then created a branch via master . What should I do to submit this branch directly to my friend s warehouse, and master can I switch branches by switch branches tags on github ? instead of overwritin...
I created a repository on github, didn t set up anything called keys, and then git push the code into the repository I just created. But every time I open a git window, I don t have to log in to my github account with git push code. Why does the Int...
Report after hexo-d ...
I have a remote repository, and then I clone it locally and submit it many times locally. there are many pictures in the submission history (various deletions and corrections). I would like to ask, if I push, will deleted images (once commit to the l...
I m the front end, and I can t run the project after I send it to the github, test and download it. The following is a screenshot 1. The computer is equipped with node.js problems caused by 2.npm install ...
gitgithubjqueryclone,jQuery.js....... ?(clonejQuery) ...
the author s project is not finished yet, so there is new content all the time. Do I have to reclone it every time? ...