This is my second failed attempt to merge a branch into another and I don't even know what's wrong. After successfully resolving all conflicts, the Event Log showed this message:
9:27 Couldn't check the working tree for unmerged files because of an error.
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.
during executing git "C:\Program Files\Git\bin\git.exe" -c core.quotepath=false commit -F C:\Users\MyUser\PycharmProjects\dogpatchsports_com\.git\MERGE_MSG --
And the branch is blocked in a "Merging branch" state. I have aboslutely no idea what is going on or how to solve it. I'd appreciate some help.