I am not able to complete the merge this error always appears:

Question

I am not able to complete the merge this error always appears:

Navigation

#1 by (1 votes)

1

fatal: Exiting because of an unresolved conflict.
U       course-git-blog-project

When I made the merge of a branch, it conflicted with the code that was in the master branch. I fix the code in hand, saved the index.html but I can not get out of the specific branch or merge the correction of the code. I do not know if it was because I did not change the branch that contained the conflict before changing the errors in the hand, but now I can not leave the place. I do not know if the error is in the course-git-blog-project folder that I deleted in a branch and not the master.

Error Screen:

git branch merge

asked by anonymous 06.07.2018 / 00:19

1 answer

Creating a client-server architecture in C # [closed] Database query error - invalid number

score 1 · Accepted Answer

The error indicates that you still have a conflict from the last merge that needs to be resolved.

To see what is the status of your current repository, use the command:

git status

This command will probably show the course-git-blog-project conflicting file. Open the file, find the conflict point, edit the file to stay the way it should be, and resolve the conflict with:

git add course-git-blog-project

After this, you can execute the command git commit that Git will open a confirmation of the commit message to resolve the conflict.