the following error occurred while executing git push :
Your branch and "origin/dev" have diverged,and have 1 and 2 different commits each, respectively.
I work on two computers. After both computers An and B started as up-to-date, I first commit and push in An a few times, and then I now write from the initial state on computer B, and then try to push, after commit (using the same local and cloud branch).
now I want to merge the two, show the difference, and then re-commit and push
suppose that the commit on the remote is A-> B
after you commit and push on computer A, the remote becomes A-> B-> C-> D
now, on computer B, it is still A-> B . Then you commit, so on computer B is A-> B-> E .
so, what you need is to change the history line on computer B into A-> B-> C-> D-> E
at this point, you need to be on computer B:
git pull --rebase origin devthis command is equivalent to:
git fetch origin
git rebase origin/dev execution, the history line on computer B becomes A-> B-> C-> D-> E , and then you can push
A-> B-> C-> D and A-> B-> E have a common ancestor B , you have a local commit E , and two more commits C and D remotely. At this point, if you want to push on the branch of A-> B-> E , git can't guess whether you want to keep C and D , or just E , or both, the above prompt will appear.
Previous: How to execute db.session.flush automatically by flask
Next: Xgboost uses Bayesian Modules to find the optimal solution for error reporting
when using gitlab-ci to build a task, the following error occurs when executing the git clone task or push tried ssh-keyscan-t rsa github.com > > ~ .ssh known_hosts failed after query. there is no problem with manual clone on the server whe...
1. the local dev build of this vue project can be run, and the console does not report an error. upload to github, I want to make a preview page via page. Result 404, and there is no specific reason for reporting an error http: lustforlife.cn...
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 ...
when git bash executes the command, the Chinese prompt is not displayed, and it is not garbled, as shown in the figure. option whether zh-CN, UTF-8 is set or useless ...
commit A-> commitB-> commit C-> commit D now I want to undo the changes to commitB or submit them backwards. ...
cd tmp back ls -al total 145636 drwxr-xr-x 2 xxx xxx 4096 Jan 17 11:04 . drwxrwxrwt 18 root root 4096 Jan 17 10:44 .. -rw-r--r-- 1 root root 45 Jan 16 18:40 imitation.tar.gz -rw-r--r-- 1 root root 146996064 Jan 16...
it s strange that last night the team worked overtime and updated a version to the server, and then I suddenly had this problem when I clicked on the update code. I have encountered such a problem once before, but I have forgotten how to solve it. And ...
the gitlab, environment is private, assuming that existing project A has two files A a.txt , A b.txt , and has a series of operations such as commit and merge. now a new project needs to be created due to business requirements, but the new project o...
on the Internet, I GIT one of other people s projects and develop my own . As a result, I modified a file locally in the project, and someone else updated this time, which caused me to report an error in git pull this time. use git stash to save to t...
there is a benchmarks directory in some open source projects, such as vue , which is very popular now. The literal translation of benchmark means benchmark test. It seems that some functional performance tests can be done. given that there is a test di...
if you use git push, only the latest commit, will not be uploaded before commit. ...
you can easily upload the target project to your github repository through ssh or directly through account configuration in pycharm. but what if the operation can operate the project in the team warehouse? needs to upload, clone and update the project...
I used a program as a development template in github by downloading it locally. based on this template, I made a lot of changes. (delete, add and modify) now the original developer has made a large-scale update to the program template. I would lik...
"how can an inexperienced junior programmer with poor skills read the project source code? " "has anyone read the source code of mybatis? just look at the initialization process and get dizzy. Friends, give me some advice! " "how to read the sour...
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! ...
has been successfully installed into node_modules through npm install https: github.com username -sharp-sharp-sharp.git-d , but there is no relevant key name in package.json, but it can be used normally if the code in my local node_modules is updated...
for git, it is only a simple operation. I would like to ask the team to assist in the general basic process ....
pull-up substitution code in git has been a problem all the time according to what is said on the Internet, git config can t handle it well. Please tell us how to reset your account or password ...
I know that using git s subtree can reference another project B as a subdirectory in one project A, but will reference the entire project B, and I only want to reference some of the code in B. the application scenario is that among several web system...
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. ...