It may appear when using git to pull remote projects
fatal: Need to specify how to reconcile divergent branches. 如图：
Solution:
Step 1: Delete the local branch.
git branch -d 分支名称If the above cannot be deleted, simply click to delete it forcibly
git branch -D 分支名称Appears after deletion is complete
Remember, you cannot delete the current branch, you need to switch branches
Extension: delete remote branch
git push origin --delete 远程分支名称Switch branch instructions:
git checkout 分支名称The local conflicting branch can be deleted after the switch is successful
Step 2: Pull the deleted branch remotely
git fetch origin 分支名称The branch name of Switched to a new branch appears to indicate successful pull.
Of course, after you delete the branch, you can also use git pull directly, depending on your personal situation.
After that, the code can be successfully git pull