1
fatal: Exiting because of an unresolved conflict.
U course-git-blog-project
When I merged a branch, it conflicted with the code on the master branch. I correct the code in hand, saved index.html but can’t exit the specific branch or merge the code correction. I don’t know if it was because I didn’t switch to the branch that contained the conflict before changing the errors in the hand, but now I can’t get out of place. I don’t know if the error is in the Course-git-blog-project folder that I deleted in a branch and not in master.
Error screen:
After editing the conflicted file, you have already done the
git addof it? And then thegit committo finish the merge?– Jefferson Quesado
I did and the error is this: fatal: cannot do a partial commit During a merge.
– Wemerson Nino
This is a sign that you have not finished solving all conflicts. How is the
git status? What he shows of unresolved conflicts?– Jefferson Quesado
From what I’ve seen, wear
git commit -i <file>I could use one but when I use the other error.$ git commit -i index.html
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
U course-git-blog-project– Wemerson Nino
git status looks like this:
Wemerson (master *+|MERGING) new-git-project
$ git status
On branch master
You have unmerged paths.
 (fix conflicts and run "git commit")
 (use "git merge --abort" to abort the merge)

Changes to be committed:

 deleted: .gitignore/#course-git-blog-project
 modified: index.html

Unmerged paths:
 (use "git add <file>..." to mark resolution)

 added by them: course-git-blog-project

Wemerson (master *+|MERGING) new-git-project
$– Wemerson Nino
Did I have to add the folder to the starging Index as well?
– Wemerson Nino
The 'git status' is fucking, man thanks, long time breaking your head here, with the problem under your nose. git status told me what was missing. Thanks.
– Wemerson Nino
@Jeffersonquesado, as he helped his colleague to solve his problem, I suggest providing an answer to the question :)
– Dherik
@Dherik thanks for reminding. I’ll see if I can do something in a few moments, but if you want to answer too, feel free.
– Jefferson Quesado
git status was reporting the conflict but had not created the custom of checking staus. When I looked there was the answer. That’s what it was all about.
– Wemerson Nino