Pull is not possible because you have unmerged files

Question reappearance:
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use ‘git add/rm < file> ‘
as appropriate to mark resolution, or use ‘git commit -a’.
In the process of [Git pull], if there are conflicting files, all other files except the conflicting files are saved as antinuclear zone files.
Local push and merge form references such as merge-head and pushhead.
– HEAD represents a local reference formed after a recent successful push;
The -merge-head represents the reference formed after a successful pull.
You can MERGE-HEAD or HEAD to achieve the effect of type and SVN Revet.
1. Open Git console:
Right click on the project –& GT; 【Open in Terminal】 –& GT; Use the Git command console.
2. Input: Git reset –hard FETCH_HEAD
– To reset conflicting local files, not only to merge-head or HEAD, but also -hard;
– No later hard, no local workspace will be flushed. It just overwhelms the stage.
3. Input: Git pull
Resubmission will succeed.
For more highlights, please follow my “toutiao” : Java cloud notes
, anytime, anywhere, to give you the latest, most convenient handheld cloud services

Read More: