solution: git reset –merge
Read More:
- You need to resolve your current index first
- You have not concluded your merge (MERGE_HEAD exists)
- Error: You have not concluded your merge (MERGE_HEAD exists)
- Git pull error: pull is not possible because you have unmerged files
- Pull is not possible because you have unmerged files
- On set in pandas_ Index and reset_ Usage of index
- Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then
- Git push you are not allowed to upload merges
- bad index file sha1 signature fatal
- Python common error: if using all scalar values, you must pass an index (four solutions)
- Electra Cydia impactor jailbreak error resolution: provision cpp:81 You already have a current iOS Development certificate
- Merging is not possible because you have unmerged files
- Index error: invalid index to scalar variable
- ./src/router/index.js Module not found: Error: Can‘t resolve ‘@/views/tet_demo‘ in ‘D:\admin\src\rou
- Error: unable to resolve dependency for… Could not resolve project
- Resolving fatal: reusing to merge unrelated histories in Git
- Please specify which branch you want to merge with
- If you open the store in iTunes, you will be prompted to solve the 310 error
- [Solved] Es delete all the data in the index without deleting the index structure, including curl deletion
- [FAQ] after git merge, the push to Gerrit fails, indicating no new changes?