What to do if pull fails in git

Solution to pull failure in git: 1. Use "git reset --hard" to force overwrite your local modifications; 2. Use "git stash" to push a new storage, and use " "git stash pop" to save the modifications to the staging area; 3. If problems still occur, save the file to the staging area and submit comments.

The operating environment of this article: Windows 10 system, Git version 2.30.0, Dell G3 computer.

What to do if pull fails in git

The reason why git pull fails is basically that the local code has been modified, and others have already submitted modifications to the same file in the warehouse. Therefore, in It seems to git that you are not making modifications in the latest state of this file, so git pull may fail. The solutions to git pull failure in the following two states are different: (Note: Please read the command line carefully. Tip, sometimes the git pull prompts that it has failed, but you haven't noticed it yet)

After the code has been submitted to the local warehouse, the git pull fails

Conflicts occur, and then resolve the conflicts

The so-called conflict resolution is to modify the conflict file to the final desired look

The code is not submitted to the local warehouse, git pull fails

Update failure prompt:

Problem:

Because the latest code is not pulled from the remote before modifying the code,

git pull reports an error:

error: Your local changes to the following files would be overwritten by merge

Solution:

1. Forcibly overwrite your own local modifications (not recommended, personal modification code is not saved)

git reset --hard //强制覆盖
git pull

2. Save the modifications to the temporary storage area

git stash       //推送一个新的储藏
git pull        //拉取
git stash pop   //从暂存区取出储藏 （更新后的代码和自己写的代码合并，可能存在冲突，需要手动解决冲突）

Note:

From the temporary After the storage area is obtained, the problem of being unable to pull new code may still occur. The error is:

Pulling is not possible because you have unmerged files.

3. Solution :

git add -u //全写为git add --update，仅将被修改的文件提交到暂存区
git commit -m"" 
git pull

Save the file to the staging area and submit comments (cannot be empty), and then pull the code to succeed. This problem occurs when files conflict.

Recommended learning: "Git Tutorial"

The above is the detailed content of What to do if pull fails in git. For more information, please follow other related articles on the PHP Chinese website!