BUG: There are unmerged index entries

Question

I am trying to merge with a branch, and this is the error I'm getting:

BUG: There are unmerged index entries:
BUG: 2 src/assets/svg/arrow-black.svg
BUG: merge-recursive.c:429: unmerged index entries in merge-recursive.c

I don't really know what else to add. I've been searching, but I saw the exact same explanation on 5 different websites, and it doesn't help

Recreating the branch doesn't help

Answer 1

Thank you Mark Adelsberger for the suggestion.

This is the answer that helped me https://stackoverflow.com/a/6013497/7055769

I fixed it by running

git merge -s resolve branch_A