Phpstorm error, how to solve?

Question

git

I have two branches, I smerged from the local devM branch to the local branch test .then I want to push to the local branch test to launch from the repository branch and I get this error...

>git pull origin test
error: Pulling 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.

committing the files didn't save me... How can I fix this error?

Answer 1

You need to open the files you merged and find something like this:
<<<<<<< HEAD
// your version
=======
// new code version
>>>>>>>
Then select one of these options, then do a git add on the file and do a git commit -m
Or another option is
git reset --hard HEAD
This will roll back to the pre-merge state