This question already has an answer here:
For some reason whenever I go to my command line this is what I see next to my cwd:
I few days back I got an error message that said I had a merge conflict. I didn't know what this meant so I stopped trying to commit. Now whenever I go onto the git terminal I see
(master|MERGING). And whenever I try to commit (even when it's not on the same remote) I get a lengthy error:
It says to fix the error but I'm not sure how to go about that. What exactly do I need to do?
See also How do I fix merge conflicts in Git?.
See also Pro Git: 3.2 Git Branching - Basic Branching and Merging - Basic Merge Conflicts.
you have merge conflicts needs resolving prior to merge, look at this answer stackoverflow.com/a/35020326/4356754
When I did git reset --merge it said Deletion of directory gitproject failed. Should I try again? (y/n)
user2030677 - Can you give output of git status?
OP, please consider that these commands will undo any changes you might have done to the files since the merge conflict error appeared.
-1 (for now): an answer that destructively removes any of the OP's data without any warning is a worse answer than "turn off your computer and you won't get any more messages". I understand that the OP is working in a newly created repository. Others reading this may not.
hvd to be fair, the OP already screwed himself over when he failed to resolve a merge in the middle of conflicts because he didn't understand what merge conflicts are.