An error occurred in git pull pull prompts you to merge?

the following error is reported when pulling the substitution code with git pull, but I don"t want to commit because I have covered other colleagues" code, so I don"t know how to pull the code
Git Pull Failed:You have not concluded your merge.Exiting because of
unfinished merge

smoothly.

Javascript html5 git

Mar.24,2021

1. It means that since the last time you pulled the substitution code, you have changed the file locally, and others have also changed the file, so you need to merge
2 locally. Local merge will not overwrite other people's code. Pay attention to

when you merge.

Previous: How to implement el-Cascader cascade selector if you want to support multiple selection

Next: Makefile pseudo-target query

MySQL Query : SELECT * FROM `codeshelper`.`v9_news` WHERE status=99 AND catid='6' ORDER BY rand() LIMIT 5
MySQL Error : Disk full (/tmp/#sql-temptable-64f5-1e4fd8a-4d3ff.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
MySQL Errno : 1021
Message : Disk full (/tmp/#sql-temptable-64f5-1e4fd8a-4d3ff.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?