git:Pull is not possible because you have unmerged files
Local push and merge will form references such as merge-head (fetch-head) and head (push-head). Head represents the reference formed after the local successful push. Merge-head represents the reference formed after successful pull. You can use merge-head or head to achieve the effect of type and svnrevent
Solution:
1. To flush out local conflict files, not only reset to merge-head or head, but also — hard. Without the hard in the back, it won’t flush out the local workspace. It just washes out the stage area
git reset--hardFETCH_Head
2. Gitpull will succeed
Similar Posts:
- [Solved] Pull is not possible because you have unmerged files
- [Solved] Git pull error: You have not concluded your merge (MERGE_HEAD exists)
- Please, commit your changes or stash them before you can merge
- How to Solve Git Error: Your local changes to the following files would be overwritten by merge
- [Solved] Git conflict Error: commit your changes or stash them before you can merge
- Git error: The following untracked working tree files would be overwritten by checkout
- Git pull Error: error: Your local changes to the following files would be overwritten by merge:
- [Solved] Computer reboot causes broken git files
- Git pull does not specify an error message for the branch