Git merge misoperation

the project has two branches b1 , b1 modified the code, and then b2 went to merge b1 , found that there were more conflicts during the merger, temporarily decided not to merge , and then abandoned all changes (changes caused by the merger) directly, and then push went remotely, and now it is found that b2 is on b2 . If you want to re- merge b1 at this point, you will be all ready up to date . And now that there are many new submissions on b2 , it is not feasible to fall back directly to the merge operation. Could you tell me how to solve this situation?

Git

Apr.06,2021

are you sure you abandoned the merge with git merge-- abort ?

Please remember commit has, of b2 or backup b2
try using git reset-- hard ORIG_HEAD fallback

on b2.

first git log to view log information,
then copy b2's commit hash value before merging
local fallback execution command git reset-hard commit-hash (the previously copied hash value is more than 6 digits)
remote code replacement git push-f
and finally merge with b1.

Previous: How el-select does not display value values

Next: Sending messages to activemq using stomp.py is not displayed in the background

"Host key verification failed" appears when gitlab runner goes to execute the script
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...

Linux gitlab-ci-runner

Feb.26,2021
A vue family bucket project is put on git page,: Page build failed.
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...

Github vue-cli

Feb.27,2021
Problems with vsCode using git
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 ...

Visual-studio-code github git

Feb.27,2021
Git bash Chinese mosaic
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 ...

Git bash

Feb.27,2021
What if only the submission of one commit in the middle is revoked?
commit A-> commitB-> commit C-> commit D now I want to undo the changes to commitB or submit them backwards. ...

Git

Feb.27,2021
Git-lfs cannot push large files?
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...

Github

Feb.27,2021
Git submit update code prompt: fatal: unable to access Failed to connect to
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 ...

Git version-Control

Feb.28,2021
How do you delete part of an existing git project and become a new one?
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...

Git

Feb.28,2021
Xiaobai asked a question about GIT update.
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...

Git

Feb.28,2021
Benchmarks is a directory in many github projects. What on earth is it for?
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...

Github javascript front-end vue.js react.js

Feb.28,2021
How to push all the historical commit of the git project to the new warehouse
if you use git push, only the latest commit, will not be uploaded before commit. ...

Git github

Feb.28,2021
Can you tell me how to use pycharm to upload a project to the team repository?
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...

Python pycharm github

Feb.28,2021
Rookie question: please ask a question about using github version to update
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...

Github

Feb.28,2021
How to read the source code?
"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...

Github

Feb.28,2021
How does Aliyun code have the same releases version as github?
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! ...

Github git

Feb.28,2021
How does npm update packages installed from github?
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...

Node.js github

Feb.28,2021
Git specification what is the process of the general company?
for git, it is only a simple operation. I would like to ask the team to assist in the general basic process ....

Git php

Feb.28,2021
The problem of abnormal error in git clone code, please tell us how to deal with it.
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 ...

Git

Feb.28,2021
How do I reference part of the code of another git project in a git project?
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...

Web mysql git

Mar.01,2021
. Problems encountered in updating local Hexo files to Github's library
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. ...

Github git node.js

Mar.01,2021