When the same file code is modified by the local branch and the remote branch, a file conflict will occur when the code of the remote branch is pulled

This error occurs Please commit your changes or stash them before you merge.

You can store the current content first, and git stash can store the current content in the stack

git stash and then git pull the new code

Then put out the content stored in the stack, git stash pop 

git stash list can view the list in the temporary storage stack

Read More:

• [Solved] git Error: error: Your local changes to the following files would be overwritten by merge
• [Solved] Git Error: fatal: refusing to merge unrelated histories
• [Solved] Git Error: fatal: refusing to merge unrelated histories
• Git Pull error: Your local changes to the following files would be overwritten by merge:
• Git Error: refusing to merge unrelated histories [How to Solve]
• How to Fix Error Cannot find command ‘git‘ – do you have ‘git‘ installed and in your PATH?
• Error husky ＞ pre-commit (node ​​v10.16.3) is reported when git commit is submitted
• How to Solve Git Error: error: unable to unlink old ‘***.jar‘
• [Solved] error: Pulling is not possible because you have unmerged files
• How to Solve Git Error: error: failed to push some refs to……
• How to Solve Error: You need to use a Theme.AppCompat theme (or descendant) with this activity.
• How to Solve Error: cannot open .Git/fetch_HEAD: Permission denied
• Git fatal: No configured push destination. Either specify the URL from the command-line or co
• How to Solve Git Push Error: error: src refspec v3.3.04.1000 matches more than one
• How to Solve Git error: out of memory
• Commit failed – exit code 1 received, with output: ‘＞running pre-commit hook: npm run precommit (Fixed)
• Git pull and Git pull origin master Warning: Pulling without specifying how to reconcile divergent branches
• How to Solve Git submodule update error
• [Solved] Git submits locally to the remote warehouse Error: failed to push some refs to…